diff --git a/org.apache.batik/.classpath b/org.apache.batik/.classpath index e43a82562..b82232a6a 100644 --- a/org.apache.batik/.classpath +++ b/org.apache.batik/.classpath @@ -1,5 +1,6 @@ + diff --git a/org.apache.batik/META-INF/MANIFEST.MF b/org.apache.batik/META-INF/MANIFEST.MF index 2f8d97b31..7be8dca3f 100644 --- a/org.apache.batik/META-INF/MANIFEST.MF +++ b/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, diff --git a/org.apache.batik/batik-codec-1.11.jar b/org.apache.batik/batik-codec-1.11.jar new file mode 100644 index 000000000..de44864d5 Binary files /dev/null and b/org.apache.batik/batik-codec-1.11.jar differ diff --git a/org.apache.batik/build.properties b/org.apache.batik/build.properties index dffd4f1f8..5d805c2e5 100644 --- a/org.apache.batik/build.properties +++ b/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 diff --git a/org.apache.batik/fop-transcoder-allinone-2.3.jar b/org.apache.batik/fop-transcoder-allinone-2.3.jar new file mode 100644 index 000000000..06db6b8c3 Binary files /dev/null and b/org.apache.batik/fop-transcoder-allinone-2.3.jar differ diff --git a/org.apache.batik/js.jar b/org.apache.batik/js.jar new file mode 100644 index 000000000..ccad3cc1b Binary files /dev/null and b/org.apache.batik/js.jar differ diff --git a/org.apache.batik/serializer-2.7.2.jar b/org.apache.batik/serializer-2.7.2.jar new file mode 100644 index 000000000..10c881c10 Binary files /dev/null and b/org.apache.batik/serializer-2.7.2.jar differ diff --git a/org.apache.batik/xalan-2.7.2.jar b/org.apache.batik/xalan-2.7.2.jar new file mode 100644 index 000000000..abdabe33e Binary files /dev/null and b/org.apache.batik/xalan-2.7.2.jar differ diff --git a/org.apache.batik/xercesImpl-2.9.1.jar b/org.apache.batik/xercesImpl-2.9.1.jar new file mode 100644 index 000000000..78abfddd2 Binary files /dev/null and b/org.apache.batik/xercesImpl-2.9.1.jar differ diff --git a/org.apache.batik/xml-apis-1.3.04.jar b/org.apache.batik/xml-apis-1.3.04.jar new file mode 100644 index 000000000..d42c0ea6c Binary files /dev/null and b/org.apache.batik/xml-apis-1.3.04.jar differ diff --git a/org.apache.batik/xml-apis-ext-1.3.04.jar b/org.apache.batik/xml-apis-ext-1.3.04.jar new file mode 100644 index 000000000..a7869d68a Binary files /dev/null and b/org.apache.batik/xml-apis-ext-1.3.04.jar differ diff --git a/org.eclipse.riena.core.log4j2.apiconfig/build.properties b/org.eclipse.riena.core.log4j2.apiconfig/build.properties index 5d49919a1..38f8165c5 100644 --- a/org.eclipse.riena.core.log4j2.apiconfig/build.properties +++ b/org.eclipse.riena.core.log4j2.apiconfig/build.properties @@ -1,3 +1,4 @@ output.. = bin/ bin.includes = META-INF/,\ - . + .,\ + readme.md diff --git a/org.eclipse.riena.example.client/icons/0410.svg b/org.eclipse.riena.example.client/icons/0410.svg new file mode 100644 index 000000000..16ee45279 --- /dev/null +++ b/org.eclipse.riena.example.client/icons/0410.svg @@ -0,0 +1,153 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/controllers/SvgPlaygroundController.java b/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/controllers/SvgPlaygroundController.java index d88d57aa0..7c8b579f9 100644 --- a/org.eclipse.riena.example.client/src/org/eclipse/riena/example/client/controllers/SvgPlaygroundController.java +++ b/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); diff --git a/org.eclipse.riena.tests/src/org/eclipse/riena/ui/swt/NumberLabelTest.java b/org.eclipse.riena.tests/src/org/eclipse/riena/ui/swt/NumberLabelTest.java deleted file mode 100644 index 76db2500b..000000000 --- a/org.eclipse.riena.tests/src/org/eclipse/riena/ui/swt/NumberLabelTest.java +++ /dev/null @@ -1,67 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007, 2014 compeople AG and others. - * 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: - * compeople AG - initial API and implementation - *******************************************************************************/ -package org.eclipse.riena.ui.swt; - -import junit.framework.TestCase; - -import org.eclipse.swt.SWT; -import org.eclipse.swt.graphics.Point; -import org.eclipse.swt.widgets.Shell; - -import org.eclipse.riena.core.test.collect.UITestCase; -import org.eclipse.riena.ui.swt.utils.SwtUtilities; - -/** - * Tests of the class {@link NumberLabel}. - */ -@UITestCase -public class NumberLabelTest extends TestCase { - - private Shell shell; - private Statusline statusline; - - /** - * @see junit.framework.TestCase#setUp() - */ - @Override - protected void setUp() throws Exception { - shell = new Shell(); - statusline = new Statusline(shell, SWT.NONE, StatuslineSpacer.class); - } - - /** - * @see junit.framework.TestCase#tearDown() - */ - @Override - protected void tearDown() throws Exception { - SwtUtilities.dispose(shell); - SwtUtilities.dispose(statusline); - } - - /** - * Tests the method {@code computeSize(int, int, boolean)}. - */ - public void testComputeSize() { - - final NumberLabel label = new NumberLabel(statusline, SWT.NONE); - - Point size = label.computeSize(12, 13, false); - assertEquals(12, size.x); - assertEquals(13, size.y); - - label.setFixWidth(4711); - size = label.computeSize(20, 30, false); - assertEquals(4711, size.x); - assertEquals(30, size.y); - - } - -} diff --git a/org.eclipse.riena.tests/src/org/eclipse/riena/ui/swt/utils/ImageStoreTest.java b/org.eclipse.riena.tests/src/org/eclipse/riena/ui/swt/utils/ImageStoreTest.java index e766cbf97..47f0aff4d 100644 --- a/org.eclipse.riena.tests/src/org/eclipse/riena/ui/swt/utils/ImageStoreTest.java +++ b/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 private 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 private method {@code getImageBounds}. *