diff options
author | Dani Megert | 2013-08-20 09:24:59 +0000 |
---|---|---|
committer | Dani Megert | 2013-08-20 09:24:59 +0000 |
commit | be8b01a42f0b798c7b58de03e0c6b92a0bbbd9de (patch) | |
tree | 5e5de1de983f3ebd1aa89f7048ad2cf2b03da826 | |
parent | 008f36a07f688bdcdc4fec579c5a05f900959c3d (diff) | |
download | eclipse.platform.ui-be8b01a42f0b798c7b58de03e0c6b92a0bbbd9de.tar.gz eclipse.platform.ui-be8b01a42f0b798c7b58de03e0c6b92a0bbbd9de.tar.xz eclipse.platform.ui-be8b01a42f0b798c7b58de03e0c6b92a0bbbd9de.zip |
Fixed compile warnings
10 files changed, 28 insertions, 26 deletions
diff --git a/bundles/org.eclipse.e4.ui.css.swt.theme/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.ui.css.swt.theme/META-INF/MANIFEST.MF index d20f7ffe04a..5cf7dfbb978 100644 --- a/bundles/org.eclipse.e4.ui.css.swt.theme/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.e4.ui.css.swt.theme/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.e4.ui.css.swt.theme;singleton:=true -Bundle-Version: 0.9.100.qualifier +Bundle-Version: 0.9.200.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/bundles/org.eclipse.e4.ui.css.swt.theme/pom.xml b/bundles/org.eclipse.e4.ui.css.swt.theme/pom.xml index 56fcdbb8a54..844d8413bb2 100644 --- a/bundles/org.eclipse.e4.ui.css.swt.theme/pom.xml +++ b/bundles/org.eclipse.e4.ui.css.swt.theme/pom.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2012 Eclipse Foundation. + Copyright (c) 2012, 2013 Eclipse Foundation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Distribution License v1.0 which accompanies this distribution, and is available at @@ -19,6 +19,6 @@ </parent> <groupId>org.eclipse.e4</groupId> <artifactId>org.eclipse.e4.ui.css.swt.theme</artifactId> - <version>0.9.100-SNAPSHOT</version> + <version>0.9.200-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/bundles/org.eclipse.e4.ui.css.swt.theme/src/org/eclipse/e4/ui/css/swt/internal/theme/ThemeEngine.java b/bundles/org.eclipse.e4.ui.css.swt.theme/src/org/eclipse/e4/ui/css/swt/internal/theme/ThemeEngine.java index 82b4c07cb2b..fe5a37a47ab 100644 --- a/bundles/org.eclipse.e4.ui.css.swt.theme/src/org/eclipse/e4/ui/css/swt/internal/theme/ThemeEngine.java +++ b/bundles/org.eclipse.e4.ui.css.swt.theme/src/org/eclipse/e4/ui/css/swt/internal/theme/ThemeEngine.java @@ -585,7 +585,7 @@ public class ThemeEngine implements IThemeEngine { } public void resetModifiedStylesheets(ITheme selection) { - List<String> ss = modifiedStylesheets.remove(selection.getId()); + modifiedStylesheets.remove(selection.getId()); } public void addCSSEngine(CSSEngine cssEngine) { diff --git a/bundles/org.eclipse.e4.ui.css.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.ui.css.swt/META-INF/MANIFEST.MF index aaa7021c154..eb4b79ea6db 100644 --- a/bundles/org.eclipse.e4.ui.css.swt/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.e4.ui.css.swt/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.e4.ui.css.swt;singleton:=true -Bundle-Version: 0.11.0.qualifier +Bundle-Version: 0.11.100.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/bundles/org.eclipse.e4.ui.css.swt/pom.xml b/bundles/org.eclipse.e4.ui.css.swt/pom.xml index a9a5432680e..7626dbc56db 100644 --- a/bundles/org.eclipse.e4.ui.css.swt/pom.xml +++ b/bundles/org.eclipse.e4.ui.css.swt/pom.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2012 Eclipse Foundation. + Copyright (c) 2012, 2013 Eclipse Foundation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Distribution License v1.0 which accompanies this distribution, and is available at @@ -19,6 +19,6 @@ </parent> <groupId>org.eclipse.e4</groupId> <artifactId>org.eclipse.e4.ui.css.swt</artifactId> - <version>0.11.0-SNAPSHOT</version> + <version>0.11.100-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/WidgetElement.java b/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/WidgetElement.java index 508ba6679a1..df170a7de62 100644 --- a/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/WidgetElement.java +++ b/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/WidgetElement.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2012 Angelo Zerr and others. + * Copyright (c) 2008, 2013 Angelo Zerr 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 @@ -200,13 +200,16 @@ public class WidgetElement extends ElementAdapter implements NodeList { Object o = widget.getData(attr.toLowerCase()); if (o != null) return o.toString(); - try { - //o = PropertyUtils.getProperty(widget, attr); - if (o != null) - return o.toString(); - } catch (Exception e) { - // e.printStackTrace(); - } + + // FIXME: Commented out dead code. Filed https://bugs.eclipse.org/415442 to review this part of the code. +// try { +// //o = PropertyUtils.getProperty(widget, attr); +// if (o != null) +// return o.toString(); +// } catch (Exception e) { +// // e.printStackTrace(); +// } + return ""; } diff --git a/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/properties/GradientBackgroundListener.java b/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/properties/GradientBackgroundListener.java index 4512acd6a5b..e553fe9f08a 100644 --- a/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/properties/GradientBackgroundListener.java +++ b/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/properties/GradientBackgroundListener.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2012 Angelo Zerr and others. + * Copyright (c) 2008, 2013 Angelo Zerr 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 @@ -59,8 +59,7 @@ public class GradientBackgroundListener implements Listener { // java.awt.RadialGradientPaint that is only available in Java 6 and // higher. Since the BREE is set to J2SE-1.5, reflection is used. try { - Class<?> radialGradientPaintClass = Class - .forName("java.awt.RadialGradientPaint"); //$NON-NLS-1$ + Class.forName("java.awt.RadialGradientPaint"); //$NON-NLS-1$ isRadialSupported = true; } catch (Exception e) { // System.err diff --git a/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/properties/css2/CSSPropertyBorderSWTHandler.java b/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/properties/css2/CSSPropertyBorderSWTHandler.java index e107249e15e..e61856ee602 100644 --- a/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/properties/css2/CSSPropertyBorderSWTHandler.java +++ b/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/properties/css2/CSSPropertyBorderSWTHandler.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2010 Angelo Zerr and others. + * Copyright (c) 2008, 2013 Angelo Zerr 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 @@ -34,8 +34,6 @@ public class CSSPropertyBorderSWTHandler extends public boolean applyCSSProperty(Object element, String property, CSSValue value, String pseudo, CSSEngine engine) throws Exception { - Widget widget = SWTElementHelpers.getWidget(element); - Control control = SWTElementHelpers.getControl(element); if (control != null) { Composite parent = control.getParent(); diff --git a/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/properties/css2/CSSPropertyClassificationSWTHandler.java b/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/properties/css2/CSSPropertyClassificationSWTHandler.java index 31a4544b54d..d2ea0857773 100644 --- a/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/properties/css2/CSSPropertyClassificationSWTHandler.java +++ b/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/properties/css2/CSSPropertyClassificationSWTHandler.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 Angelo Zerr and others. + * Copyright (c) 2008, 2013 Angelo Zerr 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 @@ -87,7 +87,7 @@ public class CSSPropertyClassificationSWTHandler extends public String retrieveCSSPropertyVisibility(Object element, String pseudo, CSSEngine engine) throws Exception { - Control control = (Control) element; + // Control control = (Control) element; // if (control.isVisible()) return "visible"; // return "hidden"; diff --git a/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyWebbyStyleHandler.java b/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyWebbyStyleHandler.java index b50f824cd91..9de8a2c91c2 100644 --- a/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyWebbyStyleHandler.java +++ b/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/properties/custom/CSSPropertyWebbyStyleHandler.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2010 IBM Corporation and others. + * Copyright (c) 2009, 2013 IBM Corporation 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 @@ -8,7 +8,6 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ - package org.eclipse.e4.ui.css.swt.properties.custom; import org.eclipse.e4.ui.css.core.dom.properties.ICSSPropertyHandler; @@ -23,7 +22,10 @@ public class CSSPropertyWebbyStyleHandler extends AbstractCSSPropertySWTHandler public void applyCSSProperty(Control control, String property, CSSValue value, String pseudo, CSSEngine engine) throws Exception { - boolean bool = (Boolean)engine.convert(value, Boolean.class, null); + + // FIXME: Commented out since it only causes a compile warning. Filed https://bugs.eclipse.org/415436 to track this. +// boolean bool = (Boolean)engine.convert(value, Boolean.class, null); + } public String retrieveCSSProperty(Control control, String property, |