Merge branch 'develop'

org.apache.batik/.classpath

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry exported="true" kind="lib" path="batik-codec-1.11.jar"/>
 	<classpathentry exported="true" kind="lib" path="xmlgraphics-commons-2.3.jar"/>
 	<classpathentry exported="true" kind="lib" path="batik-awt-util-1.11.jar"/>
 	<classpathentry exported="true" kind="lib" path="batik-script-1.11.jar"/>

org.apache.batik/META-INF/MANIFEST.MF

@@ -21,7 +21,8 @@ Bundle-ClassPath: batik-bridge-1.11.jar,
  batik-constants-1.11.jar,
  batik-script-1.11.jar,
  batik-awt-util-1.11.jar,
- xmlgraphics-commons-2.3.jar
+ xmlgraphics-commons-2.3.jar,
+ batik-codec-1.11.jar
 Export-Package: org.apache.batik,
  org.apache.batik.anim,
  org.apache.batik.anim.dom,
@@ -51,6 +52,9 @@ Export-Package: org.apache.batik,
  org.apache.batik.ext.awt.g2d,
  org.apache.batik.ext.awt.geom,
  org.apache.batik.ext.awt.image,
+ org.apache.batik.ext.awt.image.codec.imageio,
+ org.apache.batik.ext.awt.image.codec.png,
+ org.apache.batik.ext.awt.image.codec.util,
  org.apache.batik.ext.awt.image.renderable,
  org.apache.batik.ext.awt.image.rendered,
  org.apache.batik.ext.awt.image.spi,

org.apache.batik/build.properties

@@ -21,5 +21,6 @@ bin.includes = .classpath,\
                batik-script-1.11.jar,\
                batik-awt-util-1.11.jar,\
                xmlgraphics-commons-2.3.jar,\
-               batik-parser-1.11.jar
+               batik-parser-1.11.jar,\
+               batik-codec-1.11.jar
 

org.eclipse.riena.core.log4j2.apiconfig/build.properties

@@ -1,3 +1,4 @@
 output.. = bin/
 bin.includes = META-INF/,\
-               .
+               .,\
+               readme.md

org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/controllers/SvgPlaygroundController.java

@@ -23,7 +23,7 @@ public void configureRidgets() {
 		final IActionRidget button1 = getRidget(IActionRidget.class, "button1");
 		final IActionRidget button2 = getRidget(IActionRidget.class, "button2");
 		final IActionRidget button3 = getRidget(IActionRidget.class, "button3");
-		button1.setIcon("cloud", IconSize.F128);
+		button1.setIcon("0410", IconSize.F128);
 		button2.setIcon("cloud", IconSize.B22);
 		button3.setIcon("cloud", IconSize.A16);
 

org.eclipse.riena.tests/src/org/eclipse/riena/ui/swt/utils/ImageStoreTest.java

@@ -18,7 +18,6 @@
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.RGB;
 import org.eclipse.swt.graphics.Rectangle;
 
 import org.eclipse.riena.core.test.RienaTestCase;
@@ -345,58 +344,6 @@ public void testGetImageDescriptorReturnsNull() {
 		assertEquals(null, image);
 	}
 
-	/**
-	 * Tests the <i>private</i> method {@code getFullSvgName}.
-	 * 
-	 * @throws Exception
-	 *             handled by JUnit
-	 */
-	public void testCreateSvgImage() throws Exception {
-
-		final ImageStore store = ImageStore.getInstance();
-
-		String name = null;
-		IconSize size = null;
-		Image image = ReflectionUtils.invokeHidden(store, "createSvgImage", name, size); //$NON-NLS-1$
-		assertNull(image);
-
-		name = "blaBla"; //$NON-NLS-1$
-		size = IconSize.A16;
-		image = ReflectionUtils.invokeHidden(store, "createSvgImage", name, size); //$NON-NLS-1$
-		assertNull(image);
-
-		name = "cloud"; //$NON-NLS-1$
-		size = IconSize.A16;
-		name = ReflectionUtils.invokeHidden(store, "getFullSvgName", name); //$NON-NLS-1$
-		image = ReflectionUtils.invokeHidden(store, "createSvgImage", name, size); //$NON-NLS-1$
-		assertNotNull(image);
-		int w = SwtUtilities.convertXToDpi(size.getWidth());
-		int h = SwtUtilities.convertYToDpi(size.getHeight());
-		assertEquals(w, image.getImageData().width);
-		assertEquals(h, image.getImageData().height);
-		if (!SwtUtilities.isDpiScalingEnabled()) {
-			final int pixelValue = image.getImageData().getPixel(0, 6);
-			final RGB rgb = image.getImageData().palette.getRGB(pixelValue);
-			assertEquals(new RGB(73, 83, 85), rgb);
-		}
-
-		name = "cloud"; //$NON-NLS-1$
-		size = IconSize.C32;
-		name = ReflectionUtils.invokeHidden(store, "getFullSvgName", name); //$NON-NLS-1$
-		image = ReflectionUtils.invokeHidden(store, "createSvgImage", name, size); //$NON-NLS-1$
-		assertNotNull(image);
-		w = SwtUtilities.convertXToDpi(size.getWidth());
-		h = SwtUtilities.convertYToDpi(size.getHeight());
-		assertEquals(w, image.getImageData().width);
-		assertEquals(h, image.getImageData().height);
-		if (!SwtUtilities.isDpiScalingEnabled()) {
-			final int pixelValue = image.getImageData().getPixel(0, 15);
-			final RGB rgb = image.getImageData().palette.getRGB(pixelValue);
-			assertEquals(new RGB(33, 34, 32), rgb);
-		}
-
-	}
-
 	/**
 	 * Tests the <i>private</i> method {@code getImageBounds}.
 	 *