diff -pruN 4.8-1/bundles/.gitignore 4.9-1/bundles/.gitignore --- 4.8-1/bundles/.gitignore 1970-01-01 00:00:00.000000000 +0000 +++ 4.9-1/bundles/.gitignore 2018-09-06 11:21:18.000000000 +0000 @@ -0,0 +1 @@ +/.project diff -pruN 4.8-1/bundles/org.eclipse.core.commands/about.html 4.9-1/bundles/org.eclipse.core.commands/about.html --- 4.8-1/bundles/org.eclipse.core.commands/about.html 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/about.html 2018-09-06 11:21:18.000000000 +0000 @@ -2,27 +2,35 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + About -

About This Content

- -

June 2, 2006

-

License

+

About This Content

-

The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise -indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at http://www.eclipse.org/legal/epl-v10.html. -For purposes of the EPL, "Program" will mean the Content.

+

November 30, 2017

+

License

-

If you did not receive this Content directly from the Eclipse Foundation, the Content is -being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor's license that was -provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at http://www.eclipse.org.

+

+ The Eclipse Foundation makes available all content in this plug-in + ("Content"). Unless otherwise indicated below, the Content + is provided to you under the terms and conditions of the Eclipse + Public License Version 2.0 ("EPL"). A copy of the EPL is + available at http://www.eclipse.org/legal/epl-2.0. + For purposes of the EPL, "Program" will mean the Content. +

+ +

+ If you did not receive this Content directly from the Eclipse + Foundation, the Content is being redistributed by another party + ("Redistributor") and different terms and conditions may + apply to your use of any object code in the Content. Check the + Redistributor's license that was provided with the Content. If no such + license exists, contact the Redistributor. Unless otherwise indicated + below, the terms and conditions of the EPL still apply to any source + code in the Content and such source code may be obtained at http://www.eclipse.org. +

\ No newline at end of file diff -pruN 4.8-1/bundles/org.eclipse.core.commands/build.properties 4.9-1/bundles/org.eclipse.core.commands/build.properties --- 4.8-1/bundles/org.eclipse.core.commands/build.properties 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/build.properties 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2004, 2015 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 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.commands/META-INF/MANIFEST.MF 4.9-1/bundles/org.eclipse.core.commands/META-INF/MANIFEST.MF --- 4.8-1/bundles/org.eclipse.core.commands/META-INF/MANIFEST.MF 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/META-INF/MANIFEST.MF 2018-09-06 11:21:18.000000000 +0000 @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.core.commands -Bundle-Version: 3.9.100.qualifier +Bundle-Version: 3.9.200.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin diff -pruN 4.8-1/bundles/org.eclipse.core.commands/plugin.properties 4.9-1/bundles/org.eclipse.core.commands/plugin.properties --- 4.8-1/bundles/org.eclipse.core.commands/plugin.properties 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/plugin.properties 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2004,2005 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 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.commands/pom.xml 4.9-1/bundles/org.eclipse.core.commands/pom.xml --- 4.8-1/bundles/org.eclipse.core.commands/pom.xml 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/pom.xml 2018-09-06 11:21:18.000000000 +0000 @@ -14,11 +14,11 @@ eclipse.platform.ui eclipse.platform.ui - 4.8.0-SNAPSHOT + 4.9.0-SNAPSHOT ../../ org.eclipse.core org.eclipse.core.commands - 3.9.100-SNAPSHOT + 3.9.200-SNAPSHOT eclipse-plugin diff -pruN 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/AbstractHandler.java 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/AbstractHandler.java --- 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/AbstractHandler.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/AbstractHandler.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/AbstractHandlerWithState.java 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/AbstractHandlerWithState.java --- 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/AbstractHandlerWithState.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/AbstractHandlerWithState.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/AbstractParameterValueConverter.java 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/AbstractParameterValueConverter.java --- 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/AbstractParameterValueConverter.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/AbstractParameterValueConverter.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/CategoryEvent.java 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/CategoryEvent.java --- 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/CategoryEvent.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/CategoryEvent.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/Category.java 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/Category.java --- 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/Category.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/Category.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/CommandEvent.java 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/CommandEvent.java --- 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/CommandEvent.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/CommandEvent.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/Command.java 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/Command.java --- 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/Command.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/Command.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2016 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/CommandManagerEvent.java 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/CommandManagerEvent.java --- 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/CommandManagerEvent.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/CommandManagerEvent.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/CommandManager.java 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/CommandManager.java --- 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/CommandManager.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/CommandManager.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2016 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/common/AbstractBitSetEvent.java 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/common/AbstractBitSetEvent.java --- 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/common/AbstractBitSetEvent.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/common/AbstractBitSetEvent.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/common/AbstractHandleObjectEvent.java 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/common/AbstractHandleObjectEvent.java --- 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/common/AbstractHandleObjectEvent.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/common/AbstractHandleObjectEvent.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/common/AbstractNamedHandleEvent.java 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/common/AbstractNamedHandleEvent.java --- 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/common/AbstractNamedHandleEvent.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/common/AbstractNamedHandleEvent.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/common/CommandException.java 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/common/CommandException.java --- 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/common/CommandException.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/common/CommandException.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/common/EventManager.java 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/common/EventManager.java --- 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/common/EventManager.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/common/EventManager.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2016 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/common/HandleObject.java 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/common/HandleObject.java --- 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/common/HandleObject.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/common/HandleObject.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/common/HandleObjectManager.java 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/common/HandleObjectManager.java --- 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/common/HandleObjectManager.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/common/HandleObjectManager.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/common/IIdentifiable.java 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/common/IIdentifiable.java --- 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/common/IIdentifiable.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/common/IIdentifiable.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/common/NamedHandleObjectComparator.java 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/common/NamedHandleObjectComparator.java --- 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/common/NamedHandleObjectComparator.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/common/NamedHandleObjectComparator.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/common/NamedHandleObject.java 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/common/NamedHandleObject.java --- 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/common/NamedHandleObject.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/common/NamedHandleObject.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/common/NotDefinedException.java 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/common/NotDefinedException.java --- 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/common/NotDefinedException.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/common/NotDefinedException.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/contexts/ContextEvent.java 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/contexts/ContextEvent.java --- 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/contexts/ContextEvent.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/contexts/ContextEvent.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/contexts/Context.java 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/contexts/Context.java --- 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/contexts/Context.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/contexts/Context.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/contexts/ContextManagerEvent.java 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/contexts/ContextManagerEvent.java --- 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/contexts/ContextManagerEvent.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/contexts/ContextManagerEvent.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2003, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/contexts/ContextManager.java 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/contexts/ContextManager.java --- 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/contexts/ContextManager.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/contexts/ContextManager.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/contexts/IContextListener.java 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/contexts/IContextListener.java --- 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/contexts/IContextListener.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/contexts/IContextListener.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/contexts/IContextManagerListener.java 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/contexts/IContextManagerListener.java --- 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/contexts/IContextManagerListener.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/contexts/IContextManagerListener.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/ExecutionEvent.java 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/ExecutionEvent.java --- 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/ExecutionEvent.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/ExecutionEvent.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/ExecutionException.java 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/ExecutionException.java --- 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/ExecutionException.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/ExecutionException.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/HandlerEvent.java 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/HandlerEvent.java --- 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/HandlerEvent.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/HandlerEvent.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/ICategoryListener.java 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/ICategoryListener.java --- 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/ICategoryListener.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/ICategoryListener.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/ICommandListener.java 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/ICommandListener.java --- 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/ICommandListener.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/ICommandListener.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/ICommandManagerListener.java 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/ICommandManagerListener.java --- 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/ICommandManagerListener.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/ICommandManagerListener.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/IExecutionListener.java 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/IExecutionListener.java --- 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/IExecutionListener.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/IExecutionListener.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/IExecutionListenerWithChecks.java 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/IExecutionListenerWithChecks.java --- 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/IExecutionListenerWithChecks.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/IExecutionListenerWithChecks.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/IHandler2.java 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/IHandler2.java --- 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/IHandler2.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/IHandler2.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/IHandlerAttributes.java 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/IHandlerAttributes.java --- 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/IHandlerAttributes.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/IHandlerAttributes.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/IHandler.java 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/IHandler.java --- 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/IHandler.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/IHandler.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/IHandlerListener.java 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/IHandlerListener.java --- 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/IHandlerListener.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/IHandlerListener.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/INamedHandleStateIds.java 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/INamedHandleStateIds.java --- 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/INamedHandleStateIds.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/INamedHandleStateIds.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/IObjectWithState.java 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/IObjectWithState.java --- 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/IObjectWithState.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/IObjectWithState.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/IParameter.java 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/IParameter.java --- 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/IParameter.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/IParameter.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/IParameterTypeListener.java 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/IParameterTypeListener.java --- 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/IParameterTypeListener.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/IParameterTypeListener.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/IParameterValues.java 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/IParameterValues.java --- 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/IParameterValues.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/IParameterValues.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/IStateListener.java 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/IStateListener.java --- 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/IStateListener.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/IStateListener.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/ITypedParameter.java 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/ITypedParameter.java --- 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/ITypedParameter.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/ITypedParameter.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/NamedHandleObjectWithState.java 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/NamedHandleObjectWithState.java --- 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/NamedHandleObjectWithState.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/NamedHandleObjectWithState.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/NotEnabledException.java 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/NotEnabledException.java --- 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/NotEnabledException.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/NotEnabledException.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/NotHandledException.java 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/NotHandledException.java --- 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/NotHandledException.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/NotHandledException.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/operations/AbstractOperation.java 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/operations/AbstractOperation.java --- 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/operations/AbstractOperation.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/operations/AbstractOperation.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/operations/DefaultOperationHistory.java 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/operations/DefaultOperationHistory.java --- 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/operations/DefaultOperationHistory.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/operations/DefaultOperationHistory.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2016 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/operations/IAdvancedUndoableOperation2.java 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/operations/IAdvancedUndoableOperation2.java --- 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/operations/IAdvancedUndoableOperation2.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/operations/IAdvancedUndoableOperation2.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/operations/IAdvancedUndoableOperation.java 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/operations/IAdvancedUndoableOperation.java --- 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/operations/IAdvancedUndoableOperation.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/operations/IAdvancedUndoableOperation.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/operations/ICompositeOperation.java 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/operations/ICompositeOperation.java --- 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/operations/ICompositeOperation.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/operations/ICompositeOperation.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/operations/IContextReplacingOperation.java 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/operations/IContextReplacingOperation.java --- 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/operations/IContextReplacingOperation.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/operations/IContextReplacingOperation.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/operations/IOperationApprover2.java 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/operations/IOperationApprover2.java --- 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/operations/IOperationApprover2.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/operations/IOperationApprover2.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/operations/IOperationApprover.java 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/operations/IOperationApprover.java --- 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/operations/IOperationApprover.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/operations/IOperationApprover.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/operations/IOperationHistory.java 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/operations/IOperationHistory.java --- 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/operations/IOperationHistory.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/operations/IOperationHistory.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/operations/IOperationHistoryListener.java 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/operations/IOperationHistoryListener.java --- 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/operations/IOperationHistoryListener.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/operations/IOperationHistoryListener.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/operations/IUndoableOperation.java 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/operations/IUndoableOperation.java --- 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/operations/IUndoableOperation.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/operations/IUndoableOperation.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/operations/IUndoContext.java 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/operations/IUndoContext.java --- 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/operations/IUndoContext.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/operations/IUndoContext.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/operations/LinearUndoEnforcer.java 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/operations/LinearUndoEnforcer.java --- 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/operations/LinearUndoEnforcer.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/operations/LinearUndoEnforcer.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/operations/LinearUndoViolationDetector.java 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/operations/LinearUndoViolationDetector.java --- 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/operations/LinearUndoViolationDetector.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/operations/LinearUndoViolationDetector.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/operations/ObjectUndoContext.java 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/operations/ObjectUndoContext.java --- 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/operations/ObjectUndoContext.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/operations/ObjectUndoContext.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/operations/OperationHistoryEvent.java 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/operations/OperationHistoryEvent.java --- 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/operations/OperationHistoryEvent.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/operations/OperationHistoryEvent.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/operations/OperationHistoryFactory.java 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/operations/OperationHistoryFactory.java --- 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/operations/OperationHistoryFactory.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/operations/OperationHistoryFactory.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/operations/OperationStatus.java 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/operations/OperationStatus.java --- 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/operations/OperationStatus.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/operations/OperationStatus.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/operations/TriggeredOperations.java 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/operations/TriggeredOperations.java --- 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/operations/TriggeredOperations.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/operations/TriggeredOperations.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2016 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/operations/UndoContext.java 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/operations/UndoContext.java --- 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/operations/UndoContext.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/operations/UndoContext.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/Parameterization.java 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/Parameterization.java --- 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/Parameterization.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/Parameterization.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/ParameterizedCommand.java 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/ParameterizedCommand.java --- 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/ParameterizedCommand.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/ParameterizedCommand.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/ParameterTypeEvent.java 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/ParameterTypeEvent.java --- 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/ParameterTypeEvent.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/ParameterTypeEvent.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/ParameterType.java 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/ParameterType.java --- 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/ParameterType.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/ParameterType.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/ParameterValueConversionException.java 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/ParameterValueConversionException.java --- 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/ParameterValueConversionException.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/ParameterValueConversionException.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/ParameterValuesException.java 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/ParameterValuesException.java --- 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/ParameterValuesException.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/ParameterValuesException.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/SerializationException.java 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/SerializationException.java --- 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/SerializationException.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/SerializationException.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/State.java 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/State.java --- 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/State.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/State.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/util/Tracing.java 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/util/Tracing.java --- 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/util/Tracing.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/util/Tracing.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/internal/commands/operations/GlobalUndoContext.java 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/internal/commands/operations/GlobalUndoContext.java --- 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/internal/commands/operations/GlobalUndoContext.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/internal/commands/operations/GlobalUndoContext.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/internal/commands/util/Util.java 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/internal/commands/util/Util.java --- 4.8-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/internal/commands/util/Util.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.commands/src/org/eclipse/core/internal/commands/util/Util.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2000, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation @@ -37,20 +40,20 @@ public final class Util { * A shared, unmodifiable, empty, sorted map. This value is guaranteed to * always be the same. */ - public final static SortedMap EMPTY_SORTED_MAP = Collections + public static final SortedMap EMPTY_SORTED_MAP = Collections .unmodifiableSortedMap(new TreeMap<>()); /** * A shared, unmodifiable, empty, sorted set. This value is guaranteed to * always be the same. */ - public final static SortedSet EMPTY_SORTED_SET = Collections.unmodifiableSortedSet(new TreeSet<>()); + public static final SortedSet EMPTY_SORTED_SET = Collections.unmodifiableSortedSet(new TreeSet<>()); /** * A shared, zero-length string -- for avoiding non-externalized string * tags. This value is guaranteed to always be the same. */ - public final static String ZERO_LENGTH_STRING = ""; //$NON-NLS-1$ + public static final String ZERO_LENGTH_STRING = ""; //$NON-NLS-1$ /** * Asserts the the given object is an instance of the given class -- diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/about.html 4.9-1/bundles/org.eclipse.core.databinding/about.html --- 4.8-1/bundles/org.eclipse.core.databinding/about.html 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/about.html 2018-09-06 11:21:18.000000000 +0000 @@ -2,27 +2,35 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + About -

About This Content

- -

June 2, 2006

-

License

+

About This Content

-

The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise -indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at http://www.eclipse.org/legal/epl-v10.html. -For purposes of the EPL, "Program" will mean the Content.

+

November 30, 2017

+

License

-

If you did not receive this Content directly from the Eclipse Foundation, the Content is -being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor's license that was -provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at http://www.eclipse.org.

+

+ The Eclipse Foundation makes available all content in this plug-in + ("Content"). Unless otherwise indicated below, the Content + is provided to you under the terms and conditions of the Eclipse + Public License Version 2.0 ("EPL"). A copy of the EPL is + available at http://www.eclipse.org/legal/epl-2.0. + For purposes of the EPL, "Program" will mean the Content. +

+ +

+ If you did not receive this Content directly from the Eclipse + Foundation, the Content is being redistributed by another party + ("Redistributor") and different terms and conditions may + apply to your use of any object code in the Content. Check the + Redistributor's license that was provided with the Content. If no such + license exists, contact the Redistributor. Unless otherwise indicated + below, the terms and conditions of the EPL still apply to any source + code in the Content and such source code may be obtained at http://www.eclipse.org. +

\ No newline at end of file diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/build.properties 4.9-1/bundles/org.eclipse.core.databinding/build.properties --- 4.8-1/bundles/org.eclipse.core.databinding/build.properties 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/build.properties 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2003, 2015 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 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/META-INF/MANIFEST.MF 4.9-1/bundles/org.eclipse.core.databinding/META-INF/MANIFEST.MF --- 4.8-1/bundles/org.eclipse.core.databinding/META-INF/MANIFEST.MF 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/META-INF/MANIFEST.MF 2018-09-06 11:21:18.000000000 +0000 @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.core.databinding -Bundle-Version: 1.6.200.qualifier +Bundle-Version: 1.7.0.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/plugin.properties 4.9-1/bundles/org.eclipse.core.databinding/plugin.properties --- 4.8-1/bundles/org.eclipse.core.databinding/plugin.properties 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/plugin.properties 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2000, 2006 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 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/pom.xml 4.9-1/bundles/org.eclipse.core.databinding/pom.xml --- 4.8-1/bundles/org.eclipse.core.databinding/pom.xml 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/pom.xml 2018-09-06 11:21:18.000000000 +0000 @@ -15,12 +15,12 @@ eclipse.platform.ui eclipse.platform.ui - 4.8.0-SNAPSHOT + 4.9.0-SNAPSHOT ../../ org.eclipse.core org.eclipse.core.databinding - 1.6.200-SNAPSHOT + 1.7.0-SNAPSHOT eclipse-plugin diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/AggregateValidationStatus.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/AggregateValidationStatus.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/AggregateValidationStatus.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/AggregateValidationStatus.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2016 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation @@ -16,7 +19,6 @@ package org.eclipse.core.databinding; import java.util.ArrayList; import java.util.Collection; -import java.util.Iterator; import java.util.List; import org.eclipse.core.databinding.observable.IObservableCollection; @@ -59,7 +61,7 @@ public final class AggregateValidationSt public static final int MAX_SEVERITY = 2; private int strategy; - private IObservableCollection validationStatusProviders; + private IObservableCollection validationStatusProviders; /** * Creates a new aggregate validation status observable for the given data @@ -87,7 +89,8 @@ public final class AggregateValidationSt * @see DataBindingContext#getValidationStatusProviders() */ public AggregateValidationStatus( - final IObservableCollection validationStatusProviders, int strategy) { + final IObservableCollection validationStatusProviders, + int strategy) { this(Realm.getDefault(), validationStatusProviders, strategy); } @@ -103,8 +106,10 @@ public final class AggregateValidationSt * @see DataBindingContext#getValidationStatusProviders() * @since 1.1 */ - public AggregateValidationStatus(final Realm realm, - final IObservableCollection validationStatusProviders, int strategy) { + public AggregateValidationStatus( + final Realm realm, + final IObservableCollection validationStatusProviders, + int strategy) { super(realm, IStatus.class); this.validationStatusProviders = validationStatusProviders; this.strategy = strategy; @@ -131,26 +136,22 @@ public final class AggregateValidationSt * a collection of validation status providers * @return a merged status */ - public static IStatus getStatusMerged(Collection validationStatusProviders) { - List statuses = new ArrayList(); - for (Iterator it = validationStatusProviders.iterator(); it.hasNext();) { - ValidationStatusProvider validationStatusProvider = (ValidationStatusProvider) it - .next(); - IStatus status = (IStatus) validationStatusProvider - .getValidationStatus().getValue(); + public static IStatus getStatusMerged(Collection validationStatusProviders) { + List statuses = new ArrayList<>(); + for (ValidationStatusProvider provider : validationStatusProviders) { + IStatus status = provider.getValidationStatus().getValue(); if (!status.isOK()) { statuses.add(status); } } if (statuses.size() == 1) { - return (IStatus) statuses.get(0); + return statuses.get(0); } if (!statuses.isEmpty()) { MultiStatus result = new MultiStatus(Policy.JFACE_DATABINDING, 0, BindingMessages .getString(BindingMessages.MULTIPLE_PROBLEMS), null); - for (Iterator it = statuses.iterator(); it.hasNext();) { - IStatus status = (IStatus) it.next(); + for (IStatus status : statuses) { result.merge(status); } return result; @@ -169,14 +170,11 @@ public final class AggregateValidationSt * validation status providers */ public static IStatus getStatusMaxSeverity( - Collection validationStatusProviders) { + Collection validationStatusProviders) { int maxSeverity = IStatus.OK; IStatus maxStatus = Status.OK_STATUS; - for (Iterator it = validationStatusProviders.iterator(); it.hasNext();) { - ValidationStatusProvider validationStatusProvider = (ValidationStatusProvider) it - .next(); - IStatus status = (IStatus) validationStatusProvider - .getValidationStatus().getValue(); + for (ValidationStatusProvider provider : validationStatusProviders) { + IStatus status = provider.getValidationStatus().getValue(); if (status.getSeverity() > maxSeverity) { maxSeverity = status.getSeverity(); maxStatus = status; diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/BindingException.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/BindingException.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/BindingException.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/BindingException.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/Binding.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/Binding.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/Binding.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/Binding.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2018 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation @@ -162,9 +165,8 @@ public abstract class Binding extends Va } @Override - public IObservableList getTargets() { - return Observables.staticObservableList(context.getValidationRealm(), - Collections.singletonList(target)); + public IObservableList getTargets() { + return Observables.staticObservableList(context.getValidationRealm(), Collections.singletonList(target)); } /** @@ -177,8 +179,7 @@ public abstract class Binding extends Va } @Override - public IObservableList getModels() { - return Observables.staticObservableList(context.getValidationRealm(), - Collections.singletonList(model)); + public IObservableList getModels() { + return Observables.staticObservableList(context.getValidationRealm(), Collections.singletonList(model)); } } diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/BindingProperties.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/BindingProperties.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/BindingProperties.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/BindingProperties.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 263709) @@ -36,82 +39,79 @@ import org.eclipse.core.runtime.IStatus; */ public class BindingProperties { /** - * Returns an {@link IListProperty} < {@link Binding} > for observing - * the bindings of a {@link DataBindingContext}. + * Returns an {@link IListProperty} for observing the bindings of a + * {@link DataBindingContext}. * - * @return an {@link IListProperty} < {@link Binding} > for observing - * the bindings of a {@link DataBindingContext}. + * @return an {@link IListProperty} for observing the bindings of a + * {@link DataBindingContext}. */ - public static IListProperty bindings() { + public static IListProperty bindings() { return new DataBindingContextBindingsProperty(); } /** - * Returns an {@link IValueProperty} < {@link IObservable} > for - * observing the model of a {@link Binding}. + * Returns an {@link IValueProperty} for observing the model of a + * {@link Binding}. * - * @return an {@link IValueProperty} < {@link IObservable} > for - * observing the model of a {@link Binding}. + * @return an {@link IValueProperty} for observing the model of a + * {@link Binding}. */ - public static IValueProperty model() { + public static IValueProperty model() { return new BindingModelProperty(); } /** - * Returns an {@link IListProperty} < {@link IObservable} > for - * observing the models of a {@link ValidationStatusProvider}. + * Returns an {@link IListProperty} for observing the models of a + * {@link ValidationStatusProvider}. * - * @return an {@link IListProperty} < {@link IObservable} > for - * observing the models of a {@link ValidationStatusProvider}. + * @return an {@link IListProperty} for observing the models of a + * {@link ValidationStatusProvider}. */ - public static IListProperty models() { + public static IListProperty models() { return new ValidationStatusProviderModelsProperty(); } /** - * Returns an {@link IValueProperty} < {@link IObservable} > for - * observing the target of a {@link Binding}. + * Returns an {@link IValueProperty} for observing the target of a + * {@link Binding}. * - * @return an {@link IValueProperty} < {@link IObservable} > for - * observing the target of a {@link Binding}. + * @return an {@link IValueProperty} for observing the target of a + * {@link Binding}. */ - public static IValueProperty target() { + public static IValueProperty target() { return new BindingTargetProperty(); } /** - * Returns an {@link IListProperty} < {@link IObservable} > for - * observing the targets of a {@link ValidationStatusProvider}. + * Returns an {@link IListProperty} for observing the targets of a + * {@link ValidationStatusProvider}. * - * @return an {@link IListProperty} < {@link IObservable} > for - * observing the targets of a {@link ValidationStatusProvider}. + * @return an {@link IListProperty} for observing the targets of a + * {@link ValidationStatusProvider}. */ - public static IListProperty targets() { + public static IListProperty targets() { return new ValidationStatusProviderTargetsProperty(); } /** - * Returns an {@link IValueProperty} < {@link IStatus} > for observing - * the validation status of a {@link ValidationStatusProvider}. + * Returns an {@link IValueProperty} for observing the validation status of + * a {@link ValidationStatusProvider}. * - * @return an {@link IValueProperty} < {@link IStatus} > for observing - * the validation status of a {@link ValidationStatusProvider}. + * @return an {@link IValueProperty} for observing the validation status of + * a {@link ValidationStatusProvider}. */ - public static IValueProperty validationStatus() { - return new ValidationStatusProviderValidationStatusProperty() - .value(Properties.observableValue(IStatus.class)); + public static IValueProperty validationStatus() { + return new ValidationStatusProviderValidationStatusProperty().value(Properties.observableValue(IStatus.class)); } /** - * Returns an {@link IListProperty} < {@link ValidationStatusProvider} - * > for observing the validation status providers of a - * {@link DataBindingContext}. + * Returns an {@link IListProperty} for observing the validation status + * providers of a {@link DataBindingContext}. * - * @return an {@link IListProperty} < {@link ValidationStatusProvider} - * > for observing the validation status providers of a - * {@link DataBindingContext}. + * @return an {@link IListProperty} for observing the validation status + * providers of a {@link DataBindingContext}. */ - public static IListProperty validationStatusProviders() { + public static IListProperty validationStatusProviders() { return new DataBindingContextValidationStatusProvidersProperty(); } @@ -131,7 +131,7 @@ public class BindingProperties { * * @since 1.4 */ - public static IValueProperty convertedValue(IConverter converter) { - return new ConverterValueProperty(converter); + public static IValueProperty convertedValue(IConverter converter) { + return new ConverterValueProperty<>(converter); } } diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/conversion/Converter.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/conversion/Converter.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/conversion/Converter.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/conversion/Converter.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation @@ -11,14 +14,18 @@ package org.eclipse.core.databinding.conversion; - /** * Abstract base class for converters. * + * @param + * type of the source value + * @param + * type of the converted value + * * @since 1.0 * */ -public abstract class Converter implements IConverter { +public abstract class Converter implements IConverter { private Object fromType; private Object toType; diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/conversion/IConverter.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/conversion/IConverter.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/conversion/IConverter.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/conversion/IConverter.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation @@ -15,14 +18,18 @@ import java.util.function.Function; /** * A one-way converter. * + * @param + * type of the source value + * @param + * type of the converted value + * * @noextend This interface is not intended to be extended by clients. * @noimplement This interface is not intended to be implemented by clients. * Clients should subclass {@link Converter}. - * * @since 1.0 * */ -public interface IConverter { +public interface IConverter { /** * Returns the type whose instances can be converted by this converter. The @@ -51,7 +58,7 @@ public interface IConverter { * the object to convert, of type {@link #getFromType()} * @return the converted object, of type {@link #getToType()} */ - public Object convert(Object fromObject); + public T convert(F fromObject); /** * Create a converter @@ -65,9 +72,8 @@ public interface IConverter { * @return a new converter instance * @since 1.6 */ - public static IConverter create(Object fromType, Object toType, @SuppressWarnings("rawtypes") Function conversion) { - return new IConverter() { - + public static IConverter create(Object fromType, Object toType, Function conversion) { + return new IConverter() { @Override public Object getFromType() { return fromType; @@ -78,9 +84,8 @@ public interface IConverter { return toType; } - @SuppressWarnings("unchecked") @Override - public Object convert(Object fromObject) { + public T convert(F fromObject) { return conversion.apply(fromObject); } }; diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/conversion/NumberToStringConverter.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/conversion/NumberToStringConverter.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/conversion/NumberToStringConverter.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/conversion/NumberToStringConverter.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation @@ -24,18 +27,22 @@ import com.ibm.icu.text.NumberFormat; * Converts a Number to a String using NumberFormat.format(...). * This class is thread safe. * + * The first type parameter of {@link Converter} is set to {@link Object} to + * preserve backwards compability, but the argument is meant to always be a + * {@link Number}. + * * @since 1.0 */ -public class NumberToStringConverter extends Converter { +public class NumberToStringConverter extends Converter { private final NumberFormat numberFormat; - private final Class fromType; + private final Class fromType; private boolean fromTypeFitsLong; private boolean fromTypeIsDecimalType; private boolean fromTypeIsBigInteger; private boolean fromTypeIsBigDecimal; - static Class icuBigDecimal = null; - static Constructor icuBigDecimalCtr = null; + static Class icuBigDecimal = null; + static Constructor icuBigDecimalCtr = null; { /* @@ -66,7 +73,7 @@ public class NumberToStringConverter ext * @param numberFormat * @param fromType */ - private NumberToStringConverter(NumberFormat numberFormat, Class fromType) { + private NumberToStringConverter(NumberFormat numberFormat, Class fromType) { super(fromType, String.class); this.numberFormat = numberFormat; @@ -98,9 +105,10 @@ public class NumberToStringConverter ext * value to convert. May be null if the converter * was constructed for a non primitive type. * @see org.eclipse.core.databinding.conversion.IConverter#convert(java.lang.Object) + * @since 1.7 */ @Override - public Object convert(Object fromObject) { + public String convert(Object fromObject) { // Null is allowed when the type is not primitve. if (fromObject == null && !fromType.isPrimitive()) { return ""; //$NON-NLS-1$ diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/conversion/StringToNumberConverter.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/conversion/StringToNumberConverter.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/conversion/StringToNumberConverter.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/conversion/StringToNumberConverter.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation @@ -29,9 +32,20 @@ import com.ibm.icu.text.NumberFormat; * Converts a String to a Number using NumberFormat.parse(...). * This class is thread safe. * + * Note that this class does not have precise type parameters because it + * manually handles argument type mismatches and throws + * {@link IllegalArgumentException}. + * + * The first type parameter of {@link NumberFormatConverter} is set to + * {@link Object} to preserve backwards compability, but the argument is meant + * to always be a {@link String}. + * + * @param + * The type to which values are converted. + * * @since 1.0 */ -public class StringToNumberConverter extends NumberFormatConverter { +public class StringToNumberConverter extends NumberFormatConverter { private Class toType; /** * NumberFormat instance to use for conversion. Access must be synchronized. @@ -115,8 +129,8 @@ public class StringToNumberConverter ext * a convenience that allows for the checking against one type * rather than boxed and unboxed types */ - private StringToNumberConverter(NumberFormat numberFormat, Class toType, - Number min, Number max, Class boxedType) { + private StringToNumberConverter(NumberFormat numberFormat, Class toType, Number min, Number max, + Class boxedType) { super(String.class, toType, numberFormat); this.toType = toType; @@ -133,13 +147,15 @@ public class StringToNumberConverter ext * @see org.eclipse.core.databinding.conversion.IConverter#convert(java.lang.Object) * @throws IllegalArgumentException * if the value isn't in the format required by the NumberFormat - * or the value is out of range for the - * {@link #getToType() to type}. + * or the value is out of range for the {@link #getToType() to + * type}. * @throws IllegalArgumentException * if conversion was not possible + * @since 1.7 */ + @SuppressWarnings("unchecked") @Override - public Object convert(Object fromObject) { + public T convert(Object fromObject) { ParseResult result = StringToNumberParser.parse(fromObject, numberFormat, toType.isPrimitive()); @@ -163,44 +179,44 @@ public class StringToNumberConverter ext */ if (Integer.class.equals(boxedType)) { if (StringToNumberParser.inIntegerRange(result.getNumber())) { - return Integer.valueOf(result.getNumber().intValue()); + return (T) Integer.valueOf(result.getNumber().intValue()); } } else if (Double.class.equals(boxedType)) { if (StringToNumberParser.inDoubleRange(result.getNumber())) { - return Double.valueOf(result.getNumber().doubleValue()); + return (T) Double.valueOf(result.getNumber().doubleValue()); } } else if (Long.class.equals(boxedType)) { if (StringToNumberParser.inLongRange(result.getNumber())) { - return Long.valueOf(result.getNumber().longValue()); + return (T) Long.valueOf(result.getNumber().longValue()); } } else if (Float.class.equals(boxedType)) { if (StringToNumberParser.inFloatRange(result.getNumber())) { - return Float.valueOf(result.getNumber().floatValue()); + return (T) Float.valueOf(result.getNumber().floatValue()); } } else if (BigInteger.class.equals(boxedType)) { Number n = result.getNumber(); if(n instanceof Long) - return BigInteger.valueOf(n.longValue()); + return (T) BigInteger.valueOf(n.longValue()); else if(n instanceof BigInteger) - return n; + return (T) n; else if(n instanceof BigDecimal) - return ((BigDecimal) n).toBigInteger(); + return (T) ((BigDecimal) n).toBigInteger(); else - return new BigDecimal(n.doubleValue()).toBigInteger(); + return (T) new BigDecimal(n.doubleValue()).toBigInteger(); } else if (BigDecimal.class.equals(boxedType)) { Number n = result.getNumber(); if(n instanceof Long) - return BigDecimal.valueOf(n.longValue()); + return (T) BigDecimal.valueOf(n.longValue()); else if(n instanceof BigInteger) - return new BigDecimal((BigInteger) n); + return (T) new BigDecimal((BigInteger) n); else if(n instanceof BigDecimal) - return n; + return (T) n; else if(icuBigDecimal != null && icuBigDecimal.isInstance(n)) { try { // Get ICU BigDecimal value and use to construct java.math.BigDecimal int scale = ((Integer) icuBigDecimalScale.invoke(n)).intValue(); BigInteger unscaledValue = (BigInteger) icuBigDecimalUnscaledValue.invoke(n); - return new java.math.BigDecimal(unscaledValue, scale); + return (T) new java.math.BigDecimal(unscaledValue, scale); } catch(IllegalAccessException e) { throw new IllegalArgumentException("Error (IllegalAccessException) converting BigDecimal using ICU"); //$NON-NLS-1$ } catch(InvocationTargetException e) { @@ -208,18 +224,19 @@ public class StringToNumberConverter ext } } else if(n instanceof Double) { BigDecimal bd = new BigDecimal(n.doubleValue()); - if(bd.scale() == 0) return bd; + if (bd.scale() == 0) + return (T) bd; throw new IllegalArgumentException("Non-integral Double value returned from NumberFormat " + //$NON-NLS-1$ "which cannot be accurately stored in a BigDecimal due to lost precision. " + //$NON-NLS-1$ "Consider using ICU4J or Java 5 which can properly format and parse these types."); //$NON-NLS-1$ } } else if (Short.class.equals(boxedType)) { if (StringToNumberParser.inShortRange(result.getNumber())) { - return Short.valueOf(result.getNumber().shortValue()); + return (T) Short.valueOf(result.getNumber().shortValue()); } } else if (Byte.class.equals(boxedType)) { if (StringToNumberParser.inByteRange(result.getNumber())) { - return Byte.valueOf(result.getNumber().byteValue()); + return (T) Byte.valueOf(result.getNumber().byteValue()); } } @@ -241,7 +258,7 @@ public class StringToNumberConverter ext * true if the convert to type is an int * @return to Integer converter for the default locale */ - public static StringToNumberConverter toInteger(boolean primitive) { + public static StringToNumberConverter toInteger(boolean primitive) { return toInteger(NumberFormat.getIntegerInstance(), primitive); } @@ -250,9 +267,8 @@ public class StringToNumberConverter ext * @param primitive * @return to Integer converter with the provided numberFormat */ - public static StringToNumberConverter toInteger(NumberFormat numberFormat, - boolean primitive) { - return new StringToNumberConverter(numberFormat, + public static StringToNumberConverter toInteger(NumberFormat numberFormat, boolean primitive) { + return new StringToNumberConverter<>(numberFormat, (primitive) ? Integer.TYPE : Integer.class, MIN_INTEGER, MAX_INTEGER, Integer.class); } @@ -262,7 +278,7 @@ public class StringToNumberConverter ext * true if the convert to type is a double * @return to Double converter for the default locale */ - public static StringToNumberConverter toDouble(boolean primitive) { + public static StringToNumberConverter toDouble(boolean primitive) { return toDouble(NumberFormat.getNumberInstance(), primitive); } @@ -271,9 +287,8 @@ public class StringToNumberConverter ext * @param primitive * @return to Double converter with the provided numberFormat */ - public static StringToNumberConverter toDouble(NumberFormat numberFormat, - boolean primitive) { - return new StringToNumberConverter(numberFormat, + public static StringToNumberConverter toDouble(NumberFormat numberFormat, boolean primitive) { + return new StringToNumberConverter<>(numberFormat, (primitive) ? Double.TYPE : Double.class, MIN_DOUBLE, MAX_DOUBLE, Double.class); } @@ -283,7 +298,7 @@ public class StringToNumberConverter ext * true if the convert to type is a long * @return to Long converter for the default locale */ - public static StringToNumberConverter toLong(boolean primitive) { + public static StringToNumberConverter toLong(boolean primitive) { return toLong(NumberFormat.getIntegerInstance(), primitive); } @@ -292,9 +307,8 @@ public class StringToNumberConverter ext * @param primitive * @return to Long converter with the provided numberFormat */ - public static StringToNumberConverter toLong(NumberFormat numberFormat, - boolean primitive) { - return new StringToNumberConverter(numberFormat, + public static StringToNumberConverter toLong(NumberFormat numberFormat, boolean primitive) { + return new StringToNumberConverter<>(numberFormat, (primitive) ? Long.TYPE : Long.class, MIN_LONG, MAX_LONG, Long.class); } @@ -304,7 +318,7 @@ public class StringToNumberConverter ext * true if the convert to type is a float * @return to Float converter for the default locale */ - public static StringToNumberConverter toFloat(boolean primitive) { + public static StringToNumberConverter toFloat(boolean primitive) { return toFloat(NumberFormat.getNumberInstance(), primitive); } @@ -313,9 +327,8 @@ public class StringToNumberConverter ext * @param primitive * @return to Float converter with the provided numberFormat */ - public static StringToNumberConverter toFloat(NumberFormat numberFormat, - boolean primitive) { - return new StringToNumberConverter(numberFormat, + public static StringToNumberConverter toFloat(NumberFormat numberFormat, boolean primitive) { + return new StringToNumberConverter<>(numberFormat, (primitive) ? Float.TYPE : Float.class, MIN_FLOAT, MAX_FLOAT, Float.class); } @@ -323,7 +336,7 @@ public class StringToNumberConverter ext /** * @return to BigInteger converter for the default locale */ - public static StringToNumberConverter toBigInteger() { + public static StringToNumberConverter toBigInteger() { return toBigInteger(NumberFormat.getIntegerInstance()); } @@ -331,8 +344,8 @@ public class StringToNumberConverter ext * @param numberFormat * @return to BigInteger converter with the provided numberFormat */ - public static StringToNumberConverter toBigInteger(NumberFormat numberFormat) { - return new StringToNumberConverter(numberFormat, BigInteger.class, + public static StringToNumberConverter toBigInteger(NumberFormat numberFormat) { + return new StringToNumberConverter<>(numberFormat, BigInteger.class, null, null, BigInteger.class); } @@ -340,7 +353,7 @@ public class StringToNumberConverter ext * @return to BigDecimal converter for the default locale * @since 1.2 */ - public static StringToNumberConverter toBigDecimal() { + public static StringToNumberConverter toBigDecimal() { return toBigDecimal(NumberFormat.getNumberInstance()); } @@ -349,8 +362,8 @@ public class StringToNumberConverter ext * @return to BigDecimal converter with the provided numberFormat * @since 1.2 */ - public static StringToNumberConverter toBigDecimal(NumberFormat numberFormat) { - return new StringToNumberConverter(numberFormat, BigDecimal.class, + public static StringToNumberConverter toBigDecimal(NumberFormat numberFormat) { + return new StringToNumberConverter<>(numberFormat, BigDecimal.class, null, null, BigDecimal.class); } @@ -360,7 +373,7 @@ public class StringToNumberConverter ext * @return to Short converter for the default locale * @since 1.2 */ - public static StringToNumberConverter toShort(boolean primitive) { + public static StringToNumberConverter toShort(boolean primitive) { return toShort(NumberFormat.getIntegerInstance(), primitive); } @@ -370,9 +383,8 @@ public class StringToNumberConverter ext * @return to Short converter with the provided numberFormat * @since 1.2 */ - public static StringToNumberConverter toShort(NumberFormat numberFormat, - boolean primitive) { - return new StringToNumberConverter(numberFormat, + public static StringToNumberConverter toShort(NumberFormat numberFormat, boolean primitive) { + return new StringToNumberConverter<>(numberFormat, (primitive) ? Short.TYPE : Short.class, MIN_SHORT, MAX_SHORT, Short.class); } @@ -383,7 +395,7 @@ public class StringToNumberConverter ext * @return to Byte converter for the default locale * @since 1.2 */ - public static StringToNumberConverter toByte(boolean primitive) { + public static StringToNumberConverter toByte(boolean primitive) { return toByte(NumberFormat.getIntegerInstance(), primitive); } @@ -393,9 +405,8 @@ public class StringToNumberConverter ext * @return to Byte converter with the provided numberFormat * @since 1.2 */ - public static StringToNumberConverter toByte(NumberFormat numberFormat, - boolean primitive) { - return new StringToNumberConverter(numberFormat, + public static StringToNumberConverter toByte(NumberFormat numberFormat, boolean primitive) { + return new StringToNumberConverter<>(numberFormat, (primitive) ? Byte.TYPE : Byte.class, MIN_BYTE, MAX_BYTE, Byte.class); } diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/DataBindingContext.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/DataBindingContext.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/DataBindingContext.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/DataBindingContext.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation @@ -14,8 +17,6 @@ *******************************************************************************/ package org.eclipse.core.databinding; -import java.util.Iterator; - import org.eclipse.core.databinding.observable.ObservableTracker; import org.eclipse.core.databinding.observable.Observables; import org.eclipse.core.databinding.observable.Realm; @@ -35,10 +36,10 @@ import org.eclipse.core.runtime.IStatus; *

* A DataBindingContext provides the following abilities: *

    - *
  • Ability to create bindings between - * {@link IObservableValue observable values}.
  • - *
  • Ability to create bindings between - * {@link IObservableList observable lists}.
  • + *
  • Ability to create bindings between {@link IObservableValue observable + * values}.
  • + *
  • Ability to create bindings between {@link IObservableList observable + * lists}.
  • *
  • Access to the bindings created by the instance.
  • *
  • Access to the list of validation status providers (this includes all * bindings).
  • @@ -47,28 +48,28 @@ import org.eclipse.core.runtime.IStatus; *

    * Multiple contexts can be used at any point in time. One strategy for the * management of contexts is the aggregation of validation statuses. For example - * an IWizardPage could use a single context and the statuses - * could be aggregated to set the page status and fulfillment. Each page in the + * an IWizardPage could use a single context and the statuses could + * be aggregated to set the page status and fulfillment. Each page in the * IWizard would have its own context instance. *

    * * @since 1.0 */ public class DataBindingContext { - private WritableList bindings; - private WritableList validationStatusProviders; + private WritableList bindings; + private WritableList validationStatusProviders; /** * Unmodifiable version of {@link #bindings} for public exposure. */ - private IObservableList unmodifiableBindings; + private IObservableList unmodifiableBindings; /** * Unmodifiable version of {@link #validationStatusProviders} for public * exposure. */ - private IObservableList unmodifiableStatusProviders; + private IObservableList unmodifiableStatusProviders; - private IObservableMap validationStatusMap; + private IObservableMap validationStatusMap; private Realm validationRealm; @@ -97,16 +98,13 @@ public class DataBindingContext { ObservableTracker.setIgnore(true); try { - bindings = new WritableList(validationRealm); - unmodifiableBindings = Observables - .unmodifiableObservableList(bindings); - - validationStatusProviders = new WritableList(validationRealm); - unmodifiableStatusProviders = Observables - .unmodifiableObservableList(validationStatusProviders); + bindings = new WritableList<>(validationRealm); + unmodifiableBindings = Observables.unmodifiableObservableList(bindings); + + validationStatusProviders = new WritableList<>(validationRealm); + unmodifiableStatusProviders = Observables.unmodifiableObservableList(validationStatusProviders); - validationStatusMap = new ValidationStatusMap(validationRealm, - bindings); + validationStatusMap = new ValidationStatusMap(validationRealm, bindings); } finally { ObservableTracker.setIgnore(false); } @@ -125,10 +123,9 @@ public class DataBindingContext { * @return created binding * @since 1.2 */ - public final Binding bindValue(IObservableValue targetObservableValue, - IObservableValue modelObservableValue) { - return bindValue(targetObservableValue, modelObservableValue, null, - null); + public final Binding bindValue(IObservableValue targetObservableValue, + IObservableValue modelObservableValue) { + return bindValue(targetObservableValue, modelObservableValue, null, null); } /** @@ -152,18 +149,19 @@ public class DataBindingContext { * * @see UpdateValueStrategy */ - public final Binding bindValue(IObservableValue targetObservableValue, - IObservableValue modelObservableValue, - UpdateValueStrategy targetToModel, UpdateValueStrategy modelToTarget) { - UpdateValueStrategy targetToModelStrategy = targetToModel != null ? targetToModel - : createTargetToModelUpdateValueStrategy(targetObservableValue, modelObservableValue); - UpdateValueStrategy modelToTargetStrategy = modelToTarget != null ? modelToTarget + public final Binding bindValue( + IObservableValue targetObservableValue, IObservableValue modelObservableValue, + UpdateValueStrategy targetToModel, + UpdateValueStrategy modelToTarget) { + UpdateValueStrategy targetToModelStrategy = targetToModel != null ? targetToModel + : createTargetToModelUpdateValueStrategy(targetObservableValue, modelObservableValue); + UpdateValueStrategy modelToTargetStrategy = modelToTarget != null ? modelToTarget : createModelToTargetUpdateValueStrategy(modelObservableValue, targetObservableValue); targetToModelStrategy.fillDefaults(targetObservableValue, modelObservableValue); modelToTargetStrategy.fillDefaults(modelObservableValue, targetObservableValue); - ValueBinding result = new ValueBinding(targetObservableValue, - modelObservableValue, targetToModelStrategy, - modelToTargetStrategy); + ValueBinding result = new ValueBinding<>( + targetObservableValue, modelObservableValue, + targetToModelStrategy, modelToTargetStrategy); result.init(this); return result; } @@ -176,9 +174,9 @@ public class DataBindingContext { * @param toValue * @return a update value strategy */ - protected UpdateValueStrategy createModelToTargetUpdateValueStrategy( - IObservableValue fromValue, IObservableValue toValue) { - return new UpdateValueStrategy(); + protected UpdateValueStrategy createModelToTargetUpdateValueStrategy( + IObservableValue fromValue, IObservableValue toValue) { + return new UpdateValueStrategy<>(); } /** @@ -189,9 +187,9 @@ public class DataBindingContext { * @param toValue * @return a update value strategy */ - protected UpdateValueStrategy createTargetToModelUpdateValueStrategy( - IObservableValue fromValue, IObservableValue toValue) { - return new UpdateValueStrategy(); + protected UpdateValueStrategy createTargetToModelUpdateValueStrategy( + IObservableValue fromValue, IObservableValue toValue) { + return new UpdateValueStrategy<>(); } /** @@ -209,8 +207,8 @@ public class DataBindingContext { * @see UpdateListStrategy * @since 1.2 */ - public final Binding bindList(IObservableList targetObservableList, - IObservableList modelObservableList) { + public final Binding bindList(IObservableList targetObservableList, + IObservableList modelObservableList) { return bindList(targetObservableList, modelObservableList, null, null); } @@ -235,20 +233,20 @@ public class DataBindingContext { * * @see UpdateListStrategy */ - public final Binding bindList(IObservableList targetObservableList, - IObservableList modelObservableList, - UpdateListStrategy targetToModel, UpdateListStrategy modelToTarget) { - UpdateListStrategy targetToModelStrategy = targetToModel != null ? targetToModel - : createTargetToModelUpdateListStrategy(targetObservableList, - modelObservableList); - UpdateListStrategy modelToTargetStrategy = modelToTarget != null ? modelToTarget - : createModelToTargetUpdateListStrategy(modelObservableList, - targetObservableList); + public final Binding bindList( + IObservableList targetObservableList, + IObservableList modelObservableList, + UpdateListStrategy targetToModel, + UpdateListStrategy modelToTarget) { + UpdateListStrategy targetToModelStrategy = targetToModel != null ? targetToModel + : createTargetToModelUpdateListStrategy(targetObservableList, modelObservableList); + UpdateListStrategy modelToTargetStrategy = modelToTarget != null ? modelToTarget + : createModelToTargetUpdateListStrategy(modelObservableList, targetObservableList); targetToModelStrategy.fillDefaults(targetObservableList, modelObservableList); modelToTargetStrategy.fillDefaults(modelObservableList, targetObservableList); - ListBinding result = new ListBinding(targetObservableList, + ListBinding result = new ListBinding<>(targetObservableList, modelObservableList, targetToModelStrategy, modelToTargetStrategy); result.init(this); @@ -260,10 +258,10 @@ public class DataBindingContext { * @param targetObservableList * @return an update list strategy */ - protected UpdateListStrategy createModelToTargetUpdateListStrategy( - IObservableList modelObservableList, - IObservableList targetObservableList) { - return new UpdateListStrategy(); + protected UpdateListStrategy createModelToTargetUpdateListStrategy( + IObservableList modelObservableList, + IObservableList targetObservableList) { + return new UpdateListStrategy<>(); } /** @@ -271,10 +269,10 @@ public class DataBindingContext { * @param modelObservableList * @return an update list strategy */ - protected UpdateListStrategy createTargetToModelUpdateListStrategy( - IObservableList targetObservableList, - IObservableList modelObservableList) { - return new UpdateListStrategy(); + protected UpdateListStrategy createTargetToModelUpdateListStrategy( + IObservableList targetObservableList, + IObservableList modelObservableList) { + return new UpdateListStrategy<>(); } /** @@ -290,17 +288,15 @@ public class DataBindingContext { * @return created binding * @since 1.2 */ - public final Binding bindSet(IObservableSet targetObservableSet, - IObservableSet modelObservableSet) { + public final Binding bindSet(IObservableSet targetObservableSet, IObservableSet modelObservableSet) { return bindSet(targetObservableSet, modelObservableSet, null, null); } /** * Creates a {@link Binding} to synchronize the values of two - * {@link IObservableSet observable sets}. During synchronization - * validation and conversion can be employed to customize the process. For - * specifics on the customization of the process see - * {@link UpdateSetStrategy}. + * {@link IObservableSet observable sets}. During synchronization validation + * and conversion can be employed to customize the process. For specifics on + * the customization of the process see {@link UpdateSetStrategy}. * * @param targetObservableSet * target set, commonly a set representing a set in the UI @@ -315,9 +311,11 @@ public class DataBindingContext { * @return created binding * @since 1.1 */ - public final Binding bindSet(IObservableSet targetObservableSet, - IObservableSet modelObservableSet, UpdateSetStrategy targetToModel, - UpdateSetStrategy modelToTarget) { + public final Binding bindSet( + IObservableSet targetObservableSet, + IObservableSet modelObservableSet, + UpdateSetStrategy targetToModel, + UpdateSetStrategy modelToTarget) { if (targetToModel == null) targetToModel = createTargetToModelUpdateSetStrategy( targetObservableSet, modelObservableSet); @@ -326,7 +324,7 @@ public class DataBindingContext { modelObservableSet, targetObservableSet); targetToModel.fillDefaults(targetObservableSet, modelObservableSet); modelToTarget.fillDefaults(modelObservableSet, targetObservableSet); - SetBinding result = new SetBinding(targetObservableSet, + SetBinding result = new SetBinding<>(targetObservableSet, modelObservableSet, targetToModel, modelToTarget); result.init(this); return result; @@ -338,10 +336,10 @@ public class DataBindingContext { * @return a default set update strategy * @since 1.1 */ - protected UpdateSetStrategy createTargetToModelUpdateSetStrategy( - IObservableSet targetObservableSet, - IObservableSet modelObservableSet) { - return new UpdateSetStrategy(); + protected UpdateSetStrategy createTargetToModelUpdateSetStrategy( + IObservableSet targetObservableSet, + IObservableSet modelObservableSet) { + return new UpdateSetStrategy<>(); } /** @@ -350,10 +348,10 @@ public class DataBindingContext { * @return a default set update strategy * @since 1.1 */ - protected UpdateSetStrategy createModelToTargetUpdateSetStrategy( - IObservableSet modelObservableSet, - IObservableSet targetObservableSet) { - return new UpdateSetStrategy(); + protected UpdateSetStrategy createModelToTargetUpdateSetStrategy( + IObservableSet modelObservableSet, + IObservableSet targetObservableSet) { + return new UpdateSetStrategy<>(); } /** @@ -362,11 +360,11 @@ public class DataBindingContext { * called in the {@link #getValidationRealm() validation realm}. */ public final void dispose() { - Binding[] bindingArray = (Binding[]) bindings.toArray(new Binding[bindings.size()]); + Binding[] bindingArray = bindings.toArray(new Binding[bindings.size()]); for (Binding binding : bindingArray) { binding.dispose(); } - ValidationStatusProvider[] statusProviderArray = (ValidationStatusProvider[]) validationStatusProviders + ValidationStatusProvider[] statusProviderArray = validationStatusProviders .toArray(new ValidationStatusProvider[validationStatusProviders .size()]); for (int i = 0; i < statusProviderArray.length; i++) { @@ -376,42 +374,39 @@ public class DataBindingContext { } /** - * Returns an unmodifiable {@link IObservableList} < {@link Binding} > - * of all bindings in order by time of addition. + * Returns an unmodifiable {@link IObservableList} of all bindings in order + * by time of addition. * - * @return an unmodifiable {@link IObservableList} < {@link Binding} > - * of all bindings + * @return an unmodifiable {@link IObservableList} of all bindings */ - public final IObservableList getBindings() { + public final IObservableList getBindings() { return unmodifiableBindings; } /** - * Returns an unmodifiable {@link IObservableList} < - * {@link ValidationStatusProvider} > of all validation status providers - * in order by time of addition. + * Returns an unmodifiable {@link IObservableList} of all validation status + * providers in order by time of addition. * - * @return an unmodifiable {@link IObservableList} < - * {@link ValidationStatusProvider} > of all validation status + * @return an unmodifiable {@link IObservableList} of all validation status * providers * @since 1.1 */ - public final IObservableList getValidationStatusProviders() { + public final IObservableList getValidationStatusProviders() { return unmodifiableStatusProviders; } /** - * Returns an {@link IObservableMap} < {@link Binding}, {@link IStatus} - * > mapping from bindings to current validation statuses. The keys of the - * map are the bindings returned by {@link #getBindings()}, and the values - * are the current IStatus objects for each binding. + * Returns an {@link IObservableMap} mapping from bindings to current + * validation statuses. The keys of the map are the bindings returned by + * {@link #getBindings()}, and the values are the current IStatus objects + * for each binding. * * @return the observable map from bindings to status objects. * * @deprecated as of 1.1, please use {@link #getValidationStatusProviders()} */ @Deprecated - public final IObservableMap getValidationStatusMap() { + public final IObservableMap getValidationStatusMap() { return validationStatusMap; } @@ -447,8 +442,7 @@ public class DataBindingContext { * */ public final void updateModels() { - for (Iterator it = bindings.iterator(); it.hasNext();) { - Binding binding = (Binding) it.next(); + for (Binding binding : bindings) { binding.updateTargetToModel(); } } @@ -459,8 +453,7 @@ public class DataBindingContext { * */ public final void updateTargets() { - for (Iterator it = bindings.iterator(); it.hasNext();) { - Binding binding = (Binding) it.next(); + for (Binding binding : bindings) { binding.updateModelToTarget(); } } diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/ListBinding.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/ListBinding.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/ListBinding.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/ListBinding.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007, 2017 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation @@ -28,27 +31,31 @@ import org.eclipse.core.runtime.MultiSta import org.eclipse.core.runtime.Status; /** + * @param + * the type of the elements in the list on the target side + * @param + * the type of the elements in the list on the model side * @since 1.0 * */ -public class ListBinding extends Binding { +public class ListBinding extends Binding { - private UpdateListStrategy targetToModel; - private UpdateListStrategy modelToTarget; - private IObservableValue validationStatusObservable; + private UpdateListStrategy targetToModel; + private UpdateListStrategy modelToTarget; + private IObservableValue validationStatusObservable; + private IObservableList target; + private IObservableList model; private boolean updatingTarget; private boolean updatingModel; - private IListChangeListener targetChangeListener = event -> { + private IListChangeListener targetChangeListener = event -> { if (!updatingTarget) { - doUpdate((IObservableList) getTarget(), (IObservableList) getModel(), event.diff, targetToModel, false, - false); + doUpdate(target, model, event.diff, targetToModel, false, false); } }; - private IListChangeListener modelChangeListener = event -> { + private IListChangeListener modelChangeListener = event -> { if (!updatingModel) { - doUpdate((IObservableList) getModel(), (IObservableList) getTarget(), event.diff, modelToTarget, false, - false); + doUpdate(model, target, event.diff, modelToTarget, false, false); } }; @@ -58,16 +65,18 @@ public class ListBinding extends Binding * @param modelToTargetStrategy * @param targetToModelStrategy */ - public ListBinding(IObservableList target, IObservableList model, - UpdateListStrategy targetToModelStrategy, - UpdateListStrategy modelToTargetStrategy) { + public ListBinding(IObservableList target, IObservableList model, + UpdateListStrategy targetToModelStrategy, + UpdateListStrategy modelToTargetStrategy) { super(target, model); + this.target = target; + this.model = model; this.targetToModel = targetToModelStrategy; this.modelToTarget = modelToTargetStrategy; } @Override - public IObservableValue getValidationStatus() { + public IObservableValue getValidationStatus() { return validationStatusObservable; } @@ -75,8 +84,9 @@ public class ListBinding extends Binding protected void preInit() { ObservableTracker.setIgnore(true); try { - validationStatusObservable = new WritableValue(context - .getValidationRealm(), Status.OK_STATUS, IStatus.class); + validationStatusObservable = new WritableValue<>( + context.getValidationRealm(), Status.OK_STATUS, + IStatus.class); } finally { ObservableTracker.setIgnore(false); } @@ -85,8 +95,8 @@ public class ListBinding extends Binding @Override protected void postInit() { if (modelToTarget.getUpdatePolicy() == UpdateListStrategy.POLICY_UPDATE) { - getModel().getRealm().exec(() -> { - ((IObservableList) getModel()).addListChangeListener(modelChangeListener); + model.getRealm().exec(() -> { + model.addListChangeListener(modelChangeListener); updateModelToTarget(); }); } else { @@ -94,8 +104,8 @@ public class ListBinding extends Binding } if (targetToModel.getUpdatePolicy() == UpdateListStrategy.POLICY_UPDATE) { - getTarget().getRealm().exec(() -> { - ((IObservableList) getTarget()).addListChangeListener(targetChangeListener); + target.getRealm().exec(() -> { + target.addListChangeListener(targetChangeListener); if (modelToTarget.getUpdatePolicy() == UpdateListStrategy.POLICY_NEVER) { // we have to sync from target to model, if the other // way round (model to target) is forbidden @@ -112,19 +122,17 @@ public class ListBinding extends Binding @Override public void updateModelToTarget() { - final IObservableList modelList = (IObservableList) getModel(); - modelList.getRealm().exec(() -> { - ListDiff diff = Diffs.computeListDiff(Collections.EMPTY_LIST, modelList); - doUpdate(modelList, (IObservableList) getTarget(), diff, modelToTarget, true, true); + model.getRealm().exec(() -> { + ListDiff diff = Diffs.computeListDiff(Collections.emptyList(), model); + doUpdate(model, target, diff, modelToTarget, true, true); }); } @Override public void updateTargetToModel() { - final IObservableList targetList = (IObservableList) getTarget(); - targetList.getRealm().exec(() -> { - ListDiff diff = Diffs.computeListDiff(Collections.EMPTY_LIST, targetList); - doUpdate(targetList, (IObservableList) getModel(), diff, targetToModel, true, true); + target.getRealm().exec(() -> { + ListDiff diff = Diffs.computeListDiff(Collections.emptyList(), target); + doUpdate(target, model, diff, targetToModel, true, true); }); } @@ -142,9 +150,9 @@ public class ListBinding extends Binding * This method may be moved to UpdateListStrategy in the future if clients * need more control over how the two lists are kept in sync. */ - private void doUpdate(final IObservableList source, - final IObservableList destination, final ListDiff diff, - final UpdateListStrategy updateListStrategy, + private void doUpdate(final IObservableList source, + final IObservableList destination, final ListDiff diff, + final UpdateListStrategy updateListStrategy, final boolean explicit, final boolean clearDestination) { final int policy = updateListStrategy.getUpdatePolicy(); if (policy != UpdateListStrategy.POLICY_NEVER) { @@ -157,7 +165,7 @@ public class ListBinding extends Binding diff.getDifferences(); } destination.getRealm().exec(() -> { - if (destination == getTarget()) { + if (destination == target) { updatingTarget = true; } else { updatingModel = true; @@ -168,11 +176,11 @@ public class ListBinding extends Binding if (clearDestination) { destination.clear(); } - diff.accept(new ListDiffVisitor() { + diff.accept(new ListDiffVisitor() { boolean useMoveAndReplace = updateListStrategy.useMoveAndReplace(); @Override - public void handleAdd(int index, Object element) { + public void handleAdd(int index, S element) { IStatus setterStatus = updateListStrategy.doAdd(destination, updateListStrategy.convert(element), index); @@ -180,14 +188,13 @@ public class ListBinding extends Binding } @Override - public void handleRemove(int index, Object element) { + public void handleRemove(int index, S element) { IStatus setterStatus = updateListStrategy.doRemove(destination, index); - mergeStatus(multiStatus, setterStatus); } @Override - public void handleMove(int oldIndex, int newIndex, Object element) { + public void handleMove(int oldIndex, int newIndex, S element) { if (useMoveAndReplace) { IStatus setterStatus = updateListStrategy .doMove(destination, oldIndex, newIndex); @@ -199,11 +206,10 @@ public class ListBinding extends Binding } @Override - public void handleReplace(int index, Object oldElement, Object newElement) { + public void handleReplace(int index, S oldElement, S newElement) { if (useMoveAndReplace) { - IStatus setterStatus = updateListStrategy - .doReplace(destination, index, newElement); - + IStatus setterStatus = updateListStrategy.doReplace( + destination, index, updateListStrategy.convert(newElement)); mergeStatus(multiStatus, setterStatus); } else { super.handleReplace(index, oldElement, newElement); @@ -215,7 +221,7 @@ public class ListBinding extends Binding } finally { setValidationStatus(multiStatus); - if (destination == getTarget()) { + if (destination == target) { updatingTarget = false; } else { updatingModel = false; @@ -246,13 +252,11 @@ public class ListBinding extends Binding @Override public void dispose() { if (targetChangeListener != null) { - ((IObservableList) getTarget()) - .removeListChangeListener(targetChangeListener); + target.removeListChangeListener(targetChangeListener); targetChangeListener = null; } if (modelChangeListener != null) { - ((IObservableList) getModel()) - .removeListChangeListener(modelChangeListener); + model.removeListChangeListener(modelChangeListener); modelChangeListener = null; } super.dispose(); diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/ObservablesManager.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/ObservablesManager.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/ObservablesManager.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/ObservablesManager.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation @@ -14,7 +17,6 @@ package org.eclipse.core.databinding; import java.util.HashMap; -import java.util.Iterator; import java.util.Map; import java.util.Map.Entry; import java.util.Set; @@ -35,8 +37,8 @@ import org.eclipse.core.internal.databin */ public class ObservablesManager { - private Set managedObservables = new IdentitySet(); - private Set excludedObservables = new IdentitySet(); + private Set managedObservables = new IdentitySet<>(); + private Set excludedObservables = new IdentitySet<>(); private Map contexts = new HashMap<>(); /** @@ -110,7 +112,7 @@ public class ObservablesManager { * Disposes of this manager and all observables that it manages. */ public void dispose() { - Set observables = new IdentitySet(); + Set observables = new IdentitySet<>(); observables.addAll(managedObservables); for (Entry entry : contexts.entrySet()) { DataBindingContext context = entry.getKey(); @@ -119,8 +121,7 @@ public class ObservablesManager { .booleanValue(); boolean disposeModels = ((Boolean) trackModelsOrTargets.b) .booleanValue(); - for (Iterator it2 = context.getBindings().iterator(); it2.hasNext();) { - Binding binding = (Binding) it2.next(); + for (Binding binding : context.getBindings()) { if (disposeTargets) { observables.add(binding.getTarget()); } @@ -130,8 +131,7 @@ public class ObservablesManager { } } observables.removeAll(excludedObservables); - for (Iterator it = observables.iterator(); it.hasNext();) { - IObservable observable = (IObservable) it.next(); + for (IObservable observable : observables) { observable.dispose(); } } diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/SetBinding.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/SetBinding.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/SetBinding.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/SetBinding.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2017 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 124684) @@ -14,7 +17,6 @@ package org.eclipse.core.databinding; import java.util.Collections; -import java.util.Iterator; import org.eclipse.core.databinding.observable.Diffs; import org.eclipse.core.databinding.observable.ObservableTracker; @@ -29,47 +31,54 @@ import org.eclipse.core.runtime.MultiSta import org.eclipse.core.runtime.Status; /** + * @param + * the type of the elements in the set on the target side + * @param + * the type of the elements in the set on the model side * @since 1.1 * */ -public class SetBinding extends Binding { +public class SetBinding extends Binding { - private UpdateSetStrategy targetToModel; - private UpdateSetStrategy modelToTarget; - private IObservableValue validationStatusObservable; + private UpdateSetStrategy targetToModel; + private UpdateSetStrategy modelToTarget; + private IObservableValue validationStatusObservable; + private IObservableSet target; + private IObservableSet model; private boolean updatingTarget; private boolean updatingModel; - private ISetChangeListener targetChangeListener = event -> { + private ISetChangeListener targetChangeListener = event -> { if (!updatingTarget) { - doUpdate((IObservableSet) getTarget(), (IObservableSet) getModel(), event.diff, targetToModel, false, - false); + doUpdate(target, model, event.diff, targetToModel, false, false); } }; - private ISetChangeListener modelChangeListener = event -> { + private ISetChangeListener modelChangeListener = event -> { if (!updatingModel) { - doUpdate((IObservableSet) getModel(), (IObservableSet) getTarget(), event.diff, modelToTarget, false, - false); + doUpdate(model, target, event.diff, modelToTarget, false, false); } }; + /** * @param target * @param model * @param modelToTargetStrategy * @param targetToModelStrategy */ - public SetBinding(IObservableSet target, IObservableSet model, - UpdateSetStrategy targetToModelStrategy, - UpdateSetStrategy modelToTargetStrategy) { + public SetBinding(IObservableSet target, IObservableSet model, + UpdateSetStrategy targetToModelStrategy, + UpdateSetStrategy modelToTargetStrategy) { super(target, model); + this.target = target; + this.model = model; this.targetToModel = targetToModelStrategy; this.modelToTarget = modelToTargetStrategy; } @Override - public IObservableValue getValidationStatus() { + public IObservableValue getValidationStatus() { return validationStatusObservable; } @@ -77,8 +86,8 @@ public class SetBinding extends Binding protected void preInit() { ObservableTracker.setIgnore(true); try { - validationStatusObservable = new WritableValue(context - .getValidationRealm(), Status.OK_STATUS, IStatus.class); + validationStatusObservable = new WritableValue<>( + context.getValidationRealm(), Status.OK_STATUS, IStatus.class); } finally { ObservableTracker.setIgnore(false); } @@ -87,8 +96,8 @@ public class SetBinding extends Binding @Override protected void postInit() { if (modelToTarget.getUpdatePolicy() == UpdateSetStrategy.POLICY_UPDATE) { - getModel().getRealm().exec(() -> { - ((IObservableSet) getModel()).addSetChangeListener(modelChangeListener); + model.getRealm().exec(() -> { + model.addSetChangeListener(modelChangeListener); updateModelToTarget(); }); } else { @@ -96,8 +105,8 @@ public class SetBinding extends Binding } if (targetToModel.getUpdatePolicy() == UpdateSetStrategy.POLICY_UPDATE) { - getTarget().getRealm().exec(() -> { - ((IObservableSet) getTarget()).addSetChangeListener(targetChangeListener); + target.getRealm().exec(() -> { + target.addSetChangeListener(targetChangeListener); if (modelToTarget.getUpdatePolicy() == UpdateSetStrategy.POLICY_NEVER) { // we have to sync from target to model, if the other // way round (model to target) is forbidden (POLICY_NEVER) @@ -113,19 +122,17 @@ public class SetBinding extends Binding @Override public void updateModelToTarget() { - final IObservableSet modelSet = (IObservableSet) getModel(); - modelSet.getRealm().exec(() -> { - SetDiff diff = Diffs.computeSetDiff(Collections.EMPTY_SET, modelSet); - doUpdate(modelSet, (IObservableSet) getTarget(), diff, modelToTarget, true, true); + model.getRealm().exec(() -> { + SetDiff diff = Diffs.computeSetDiff(Collections.emptySet(), model); + doUpdate(model, target, diff, modelToTarget, true, true); }); } @Override public void updateTargetToModel() { - final IObservableSet targetSet = (IObservableSet) getTarget(); - targetSet.getRealm().exec(() -> { - SetDiff diff = Diffs.computeSetDiff(Collections.EMPTY_SET, targetSet); - doUpdate(targetSet, (IObservableSet) getModel(), diff, targetToModel, true, true); + target.getRealm().exec(() -> { + SetDiff diff = Diffs.computeSetDiff(Collections.emptySet(), target); + doUpdate(target, model, diff, targetToModel, true, true); }); } @@ -143,10 +150,9 @@ public class SetBinding extends Binding * This method may be moved to UpdateSetStrategy in the future if clients * need more control over how the two sets are kept in sync. */ - private void doUpdate(final IObservableSet source, - final IObservableSet destination, final SetDiff diff, - final UpdateSetStrategy updateSetStrategy, final boolean explicit, - final boolean clearDestination) { + private void doUpdate(final IObservableSet source, final IObservableSet destination, + final SetDiff diff, final UpdateSetStrategy updateSetStrategy, + final boolean explicit, final boolean clearDestination) { final int policy = updateSetStrategy.getUpdatePolicy(); if (policy == UpdateSetStrategy.POLICY_NEVER) return; @@ -161,7 +167,7 @@ public class SetBinding extends Binding diff.getRemovals(); } destination.getRealm().exec(() -> { - if (destination == getTarget()) { + if (destination == target) { updatingTarget = true; } else { updatingModel = true; @@ -173,9 +179,8 @@ public class SetBinding extends Binding destination.clear(); } - for (Iterator iterator1 = diff.getRemovals().iterator(); iterator1.hasNext();) { - IStatus setterStatus1 = updateSetStrategy.doRemove(destination, - updateSetStrategy.convert(iterator1.next())); + for (S element : diff.getRemovals()) { + IStatus setterStatus1 = updateSetStrategy.doRemove(destination, updateSetStrategy.convert(element)); mergeStatus(multiStatus, setterStatus1); // TODO - at this point, the two sets @@ -183,9 +188,8 @@ public class SetBinding extends Binding // occurred... } - for (Iterator iterator2 = diff.getAdditions().iterator(); iterator2.hasNext();) { - IStatus setterStatus2 = updateSetStrategy.doAdd(destination, - updateSetStrategy.convert(iterator2.next())); + for (S element : diff.getAdditions()) { + IStatus setterStatus2 = updateSetStrategy.doAdd(destination, updateSetStrategy.convert(element)); mergeStatus(multiStatus, setterStatus2); // TODO - at this point, the two sets @@ -195,7 +199,7 @@ public class SetBinding extends Binding } finally { setValidationStatus(multiStatus); - if (destination == getTarget()) { + if (destination == target) { updatingTarget = false; } else { updatingModel = false; @@ -224,13 +228,11 @@ public class SetBinding extends Binding @Override public void dispose() { if (targetChangeListener != null) { - ((IObservableSet) getTarget()) - .removeSetChangeListener(targetChangeListener); + target.removeSetChangeListener(targetChangeListener); targetChangeListener = null; } if (modelChangeListener != null) { - ((IObservableSet) getModel()) - .removeSetChangeListener(modelChangeListener); + model.removeSetChangeListener(modelChangeListener); modelChangeListener = null; } super.dispose(); diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/UpdateListStrategy.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/UpdateListStrategy.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/UpdateListStrategy.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/UpdateListStrategy.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation @@ -37,13 +40,20 @@ import org.eclipse.core.runtime.Status; * {@link #POLICY_NEVER}, {@link #POLICY_ON_REQUEST}, {@link #POLICY_UPDATE}). *

    * - * + * @param + * the type of the elements on the source side (i.e. the model side + * if this is a model-to-target update and the target side if this is + * a target-to-model update) + * @param + * the type of the elements on the destination side (i.e. the target + * side if this is a model-to-target update and the model side if + * this is a target-to-model update) * @see DataBindingContext#bindList(IObservableList, IObservableList, * UpdateListStrategy, UpdateListStrategy) * @see IConverter * @since 1.0 */ -public class UpdateListStrategy extends UpdateStrategy { +public class UpdateListStrategy extends UpdateStrategy { /** * Policy constant denoting that the source observable's state should not be @@ -131,13 +141,13 @@ public class UpdateListStrategy extends * @param source * @param destination */ - protected void fillDefaults(IObservableList source, - IObservableList destination) { + @SuppressWarnings("unchecked") + protected void fillDefaults(IObservableList source, IObservableList destination) { Object sourceType = source.getElementType(); Object destinationType = destination.getElementType(); if (provideDefaults && sourceType != null && destinationType != null) { if (converter == null) { - setConverter(createConverter(sourceType, destinationType)); + setConverter((IConverter) createConverter(sourceType, destinationType)); } } if (converter != null) { @@ -166,7 +176,7 @@ public class UpdateListStrategy extends * @param converter * @return the receiver, to enable method call chaining */ - public UpdateListStrategy setConverter(IConverter converter) { + public UpdateListStrategy setConverter(IConverter converter) { this.converter = converter; return this; } @@ -180,8 +190,7 @@ public class UpdateListStrategy extends * @param index * @return a status */ - protected IStatus doAdd(IObservableList observableList, Object element, - int index) { + protected IStatus doAdd(IObservableList observableList, D element, int index) { try { observableList.add(index, element); } catch (Exception ex) { @@ -198,7 +207,7 @@ public class UpdateListStrategy extends * @param index * @return a status */ - protected IStatus doRemove(IObservableList observableList, int index) { + protected IStatus doRemove(IObservableList observableList, int index) { try { observableList.remove(index); } catch (Exception ex) { @@ -247,8 +256,7 @@ public class UpdateListStrategy extends * @return a status * @since 1.2 */ - protected IStatus doMove(IObservableList observableList, int oldIndex, - int newIndex) { + protected IStatus doMove(IObservableList observableList, int oldIndex, int newIndex) { try { observableList.move(oldIndex, newIndex); } catch (Exception ex) { @@ -267,8 +275,7 @@ public class UpdateListStrategy extends * @return a status * @since 1.2 */ - protected IStatus doReplace(IObservableList observableList, int index, - Object element) { + protected IStatus doReplace(IObservableList observableList, int index, D element) { try { observableList.set(index, element); } catch (Exception ex) { diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/UpdateSetStrategy.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/UpdateSetStrategy.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/UpdateSetStrategy.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/UpdateSetStrategy.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 124684) @@ -37,27 +40,34 @@ import org.eclipse.core.runtime.Status; * {@link #POLICY_NEVER}, {@link #POLICY_ON_REQUEST}, {@link #POLICY_UPDATE}). *

    * - * + * @param + * the type of the elements on the source side (i.e. the model side + * if this is a model-to-target update and the target side if this is + * a target-to-model update) + * @param + * the type of the elements on the destination side (i.e. the target + * side if this is a model-to-target update and the model side if + * this is a target-to-model update) * @see DataBindingContext#bindSet(IObservableSet, IObservableSet, * UpdateSetStrategy, UpdateSetStrategy) * @see IConverter * @since 1.1 */ -public class UpdateSetStrategy extends UpdateStrategy { +public class UpdateSetStrategy extends UpdateStrategy { /** * Policy constant denoting that the source observable's state should not be * tracked and that the destination observable's state should never be * updated. */ - public final static int POLICY_NEVER = notInlined(1); + public static final int POLICY_NEVER = notInlined(1); /** * Policy constant denoting that the source observable's state should not be * tracked, but that conversion and updating the destination observable's * state should be performed when explicitly requested. */ - public final static int POLICY_ON_REQUEST = notInlined(2); + public static final int POLICY_ON_REQUEST = notInlined(2); /** * Policy constant denoting that the source observable's state should be @@ -65,7 +75,7 @@ public class UpdateSetStrategy extends U * state should be performed automatically on every change of the source * observable state. */ - public final static int POLICY_UPDATE = notInlined(8); + public static final int POLICY_UPDATE = notInlined(8); /** * Helper method allowing API evolution of the above constant values. The @@ -131,13 +141,13 @@ public class UpdateSetStrategy extends U * @param source * @param destination */ - protected void fillDefaults(IObservableSet source, - IObservableSet destination) { + @SuppressWarnings("unchecked") + protected void fillDefaults(IObservableSet source, IObservableSet destination) { Object sourceType = source.getElementType(); Object destinationType = destination.getElementType(); if (provideDefaults && sourceType != null && destinationType != null) { if (converter == null) { - setConverter(createConverter(sourceType, destinationType)); + setConverter((IConverter) createConverter(sourceType, destinationType)); } } if (converter != null) { @@ -166,7 +176,7 @@ public class UpdateSetStrategy extends U * @param converter * @return the receiver, to enable method call chaining */ - public UpdateSetStrategy setConverter(IConverter converter) { + public UpdateSetStrategy setConverter(IConverter converter) { this.converter = converter; return this; } @@ -179,7 +189,7 @@ public class UpdateSetStrategy extends U * @param element * @return a status */ - protected IStatus doAdd(IObservableSet observableSet, Object element) { + protected IStatus doAdd(IObservableSet observableSet, D element) { try { observableSet.add(element); } catch (Exception ex) { @@ -196,7 +206,7 @@ public class UpdateSetStrategy extends U * @param element * @return a status */ - protected IStatus doRemove(IObservableSet observableSet, Object element) { + protected IStatus doRemove(IObservableSet observableSet, D element) { try { observableSet.remove(element); } catch (Exception ex) { diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/UpdateStrategy.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/UpdateStrategy.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/UpdateStrategy.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/UpdateStrategy.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007, 2018 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation @@ -15,6 +18,7 @@ package org.eclipse.core.databinding; import java.math.BigDecimal; import java.math.BigInteger; +import java.text.Format; import java.util.HashMap; import java.util.Map; @@ -51,7 +55,7 @@ import com.ibm.icu.text.NumberFormat; * @since 1.0 * */ -/* package */class UpdateStrategy { +/* package */class UpdateStrategy { private static final String BOOLEAN_CLASS = "boolean.class"; //$NON-NLS-1$ @@ -69,9 +73,9 @@ import com.ibm.icu.text.NumberFormat; private static final String CHARACTER_CLASS = "char.class"; //$NON-NLS-1$ - private static Map converterMap; + private static Map converterMap; - private static Class autoboxed(Class clazz) { + private static Class autoboxed(Class clazz) { if (clazz == Float.TYPE) return Float.class; else if (clazz == Double.TYPE) @@ -91,7 +95,7 @@ import com.ibm.icu.text.NumberFormat; return clazz; } - protected IConverter converter; + protected IConverter converter; final protected void checkAssignable(Object toType, Object fromType, String errorString) { @@ -107,39 +111,35 @@ import com.ibm.icu.text.NumberFormat; /** * Tries to create a converter that can convert from values of type * fromType. Returns null if no converter could be created. - * Either toType or modelDescription can be null, but not - * both. + * Either toType or modelDescription can be null, but not both. * * @param fromType * @param toType * @return an IConverter, or null if unsuccessful */ - protected IConverter createConverter(Object fromType, Object toType) { + protected IConverter createConverter(Object fromType, Object toType) { if (!(fromType instanceof Class) || !(toType instanceof Class)) { return new DefaultConverter(fromType, toType); } - Class toClass = (Class) toType; - Class originalToClass = toClass; + Class toClass = (Class) toType; + Class originalToClass = toClass; if (toClass.isPrimitive()) { toClass = autoboxed(toClass); } - Class fromClass = (Class) fromType; - Class originalFromClass = fromClass; + Class fromClass = (Class) fromType; + Class originalFromClass = fromClass; if (fromClass.isPrimitive()) { fromClass = autoboxed(fromClass); } - if (!((Class) toType).isPrimitive() - && toClass.isAssignableFrom(fromClass)) { + if (!((Class) toType).isPrimitive() && toClass.isAssignableFrom(fromClass)) { return new IdentityConverter(originalFromClass, originalToClass); } - if (((Class) fromType).isPrimitive() && ((Class) toType).isPrimitive() - && fromType.equals(toType)) { + if (((Class) fromType).isPrimitive() && ((Class) toType).isPrimitive() && fromType.equals(toType)) { return new IdentityConverter(originalFromClass, originalToClass); } - Map converterMap = getConverterMap(); - Class[] supertypeHierarchyFlattened = ClassLookupSupport - .getTypeHierarchyFlattened(fromClass); - for (Class currentFromClass : supertypeHierarchyFlattened) { + Map converterMap = getConverterMap(); + Class[] supertypeHierarchyFlattened = ClassLookupSupport.getTypeHierarchyFlattened(fromClass); + for (Class currentFromClass : supertypeHierarchyFlattened) { if (currentFromClass == toType) { // converting to toType is just a widening return new IdentityConverter(fromClass, toClass); @@ -147,13 +147,13 @@ import com.ibm.icu.text.NumberFormat; Pair key = new Pair(getKeyForClass(fromType, currentFromClass), getKeyForClass(toType, toClass)); Object converterOrClassname = converterMap.get(key); if (converterOrClassname instanceof IConverter) { - return (IConverter) converterOrClassname; + return (IConverter) converterOrClassname; } else if (converterOrClassname instanceof String) { String classname = (String) converterOrClassname; Class converterClass; try { converterClass = Class.forName(classname); - IConverter result = (IConverter) converterClass.getDeclaredConstructor().newInstance(); + IConverter result = (IConverter) converterClass.getDeclaredConstructor().newInstance(); converterMap.put(key, result); return result; } catch (Exception e) { @@ -177,7 +177,7 @@ import com.ibm.icu.text.NumberFormat; return new DefaultConverter(fromType, toType); } - private synchronized static Map getConverterMap() { + private synchronized static Map getConverterMap() { // using string-based lookup avoids loading of too many classes if (converterMap == null) { // NumberFormat to be shared across converters for the formatting of @@ -187,7 +187,7 @@ import com.ibm.icu.text.NumberFormat; // integer values NumberFormat numberFormat = NumberFormat.getNumberInstance(); - converterMap = new HashMap(); + converterMap = new HashMap(); // Standard and Boxed Types converterMap .put( @@ -416,11 +416,11 @@ import com.ibm.icu.text.NumberFormat; return converterMap; } - private static final Class[] integerClasses = new Class[] { byte.class, + private static final Class[] integerClasses = new Class[] { byte.class, Byte.class, short.class, Short.class, int.class, Integer.class, long.class, Long.class, BigInteger.class }; - private static final Class[] floatClasses = new Class[] { float.class, + private static final Class[] floatClasses = new Class[] { float.class, Float.class, double.class, Double.class, BigDecimal.class }; /** @@ -431,22 +431,17 @@ import com.ibm.icu.text.NumberFormat; * @param numberFormat * @param fromTypes */ - private static void addNumberToByteConverters(Map map, - NumberFormat numberFormat, Class[] fromTypes) { + private static void addNumberToByteConverters(Map map, Format numberFormat, Class[] fromTypes) { - for (Class fromType : fromTypes) { + for (Class fromType : fromTypes) { if (!fromType.equals(Byte.class) && !fromType.equals(byte.class)) { String fromName = (fromType.isPrimitive()) ? getKeyForClass( fromType, null) : fromType.getName(); - map - .put(new Pair(fromName, BYTE_CLASS), - new NumberToByteConverter(numberFormat, - fromType, true)); - map - .put(new Pair(fromName, Byte.class.getName()), - new NumberToByteConverter(numberFormat, - fromType, false)); + map.put(new Pair(fromName, BYTE_CLASS), + new NumberToByteConverter(numberFormat, fromType, true)); + map.put(new Pair(fromName, Byte.class.getName()), + new NumberToByteConverter(numberFormat, fromType, false)); } } } @@ -459,17 +454,14 @@ import com.ibm.icu.text.NumberFormat; * @param numberFormat * @param fromTypes */ - private static void addNumberToShortConverters(Map map, - NumberFormat numberFormat, Class[] fromTypes) { - for (Class fromType : fromTypes) { + private static void addNumberToShortConverters(Map map, Format numberFormat, Class[] fromTypes) { + for (Class fromType : fromTypes) { if (!fromType.equals(Short.class) && !fromType.equals(short.class)) { String fromName = (fromType.isPrimitive()) ? getKeyForClass( fromType, null) : fromType.getName(); - map - .put(new Pair(fromName, SHORT_CLASS), - new NumberToShortConverter(numberFormat, - fromType, true)); + map.put(new Pair(fromName, SHORT_CLASS), + new NumberToShortConverter(numberFormat, fromType, true)); map.put(new Pair(fromName, Short.class.getName()), new NumberToShortConverter(numberFormat, fromType, false)); @@ -485,9 +477,8 @@ import com.ibm.icu.text.NumberFormat; * @param numberFormat * @param fromTypes */ - private static void addNumberToIntegerConverters(Map map, - NumberFormat numberFormat, Class[] fromTypes) { - for (Class fromType : fromTypes) { + private static void addNumberToIntegerConverters(Map map, Format numberFormat, Class[] fromTypes) { + for (Class fromType : fromTypes) { if (!fromType.equals(Integer.class) && !fromType.equals(int.class)) { String fromName = (fromType.isPrimitive()) ? getKeyForClass( @@ -511,21 +502,16 @@ import com.ibm.icu.text.NumberFormat; * @param numberFormat * @param fromTypes */ - private static void addNumberToLongConverters(Map map, - NumberFormat numberFormat, Class[] fromTypes) { - for (Class fromType : fromTypes) { + private static void addNumberToLongConverters(Map map, Format numberFormat, Class[] fromTypes) { + for (Class fromType : fromTypes) { if (!fromType.equals(Long.class) && !fromType.equals(long.class)) { String fromName = (fromType.isPrimitive()) ? getKeyForClass( fromType, null) : fromType.getName(); - map - .put(new Pair(fromName, LONG_CLASS), - new NumberToLongConverter(numberFormat, - fromType, true)); - map - .put(new Pair(fromName, Long.class.getName()), - new NumberToLongConverter(numberFormat, - fromType, false)); + map.put(new Pair(fromName, LONG_CLASS), + new NumberToLongConverter(numberFormat, fromType, true)); + map.put(new Pair(fromName, Long.class.getName()), + new NumberToLongConverter(numberFormat, fromType, false)); } } } @@ -538,17 +524,14 @@ import com.ibm.icu.text.NumberFormat; * @param numberFormat * @param fromTypes */ - private static void addNumberToFloatConverters(Map map, - NumberFormat numberFormat, Class[] fromTypes) { - for (Class fromType : fromTypes) { + private static void addNumberToFloatConverters(Map map, Format numberFormat, Class[] fromTypes) { + for (Class fromType : fromTypes) { if (!fromType.equals(Float.class) && !fromType.equals(float.class)) { String fromName = (fromType.isPrimitive()) ? getKeyForClass( fromType, null) : fromType.getName(); - map - .put(new Pair(fromName, FLOAT_CLASS), - new NumberToFloatConverter(numberFormat, - fromType, true)); + map.put(new Pair(fromName, FLOAT_CLASS), + new NumberToFloatConverter(numberFormat, fromType, true)); map.put(new Pair(fromName, Float.class.getName()), new NumberToFloatConverter(numberFormat, fromType, false)); @@ -564,9 +547,8 @@ import com.ibm.icu.text.NumberFormat; * @param numberFormat * @param fromTypes */ - private static void addNumberToDoubleConverters(Map map, - NumberFormat numberFormat, Class[] fromTypes) { - for (Class fromType : fromTypes) { + private static void addNumberToDoubleConverters(Map map, Format numberFormat, Class[] fromTypes) { + for (Class fromType : fromTypes) { if (!fromType.equals(Double.class) && !fromType.equals(double.class)) { String fromName = (fromType.isPrimitive()) ? getKeyForClass( fromType, null) : fromType.getName(); @@ -589,17 +571,15 @@ import com.ibm.icu.text.NumberFormat; * @param numberFormat * @param fromTypes */ - private static void addNumberToBigIntegerConverters(Map map, - NumberFormat numberFormat, Class[] fromTypes) { - for (Class fromType : fromTypes) { + private static void addNumberToBigIntegerConverters(Map map, Format numberFormat, + Class[] fromTypes) { + for (Class fromType : fromTypes) { if (!fromType.equals(BigInteger.class)) { String fromName = (fromType.isPrimitive()) ? getKeyForClass( fromType, null) : fromType.getName(); - map - .put(new Pair(fromName, BigInteger.class.getName()), - new NumberToBigIntegerConverter(numberFormat, - fromType)); + map.put(new Pair(fromName, BigInteger.class.getName()), + new NumberToBigIntegerConverter(numberFormat, fromType)); } } } @@ -612,25 +592,23 @@ import com.ibm.icu.text.NumberFormat; * @param numberFormat * @param fromTypes */ - private static void addNumberToBigDecimalConverters(Map map, - NumberFormat numberFormat, Class[] fromTypes) { - for (Class fromType : fromTypes) { + private static void addNumberToBigDecimalConverters(Map map, Format numberFormat, + Class[] fromTypes) { + for (Class fromType : fromTypes) { if (!fromType.equals(BigDecimal.class)) { String fromName = (fromType.isPrimitive()) ? getKeyForClass( fromType, null) : fromType.getName(); - map - .put(new Pair(fromName, BigDecimal.class.getName()), - new NumberToBigDecimalConverter(numberFormat, - fromType)); + map.put(new Pair(fromName, BigDecimal.class.getName()), + new NumberToBigDecimalConverter(numberFormat, fromType)); } } } private static String getKeyForClass(Object originalValue, - Class filteredValue) { + Class filteredValue) { if (originalValue instanceof Class) { - Class originalClass = (Class) originalValue; + Class originalClass = (Class) originalValue; if (originalClass.equals(int.class)) { return INTEGER_CLASS; } else if (originalClass.equals(byte.class)) { @@ -657,16 +635,16 @@ import com.ibm.icu.text.NumberFormat; * * @param fromType * @param toType - * @return whether fromType is assignable to toType, or null - * if unknown + * @return whether fromType is assignable to toType, or null if + * unknown */ protected Boolean isAssignableFromTo(Object fromType, Object toType) { if (fromType instanceof Class && toType instanceof Class) { - Class toClass = (Class) toType; + Class toClass = (Class) toType; if (toClass.isPrimitive()) { toClass = autoboxed(toClass); } - Class fromClass = (Class) fromType; + Class fromClass = (Class) fromType; if (fromClass.isPrimitive()) { fromClass = autoboxed(fromClass); } @@ -698,7 +676,8 @@ import com.ibm.icu.text.NumberFormat; * @param value * @return the converted value */ - public Object convert(Object value) { + @SuppressWarnings("unchecked") + public D convert(S value) { if (converter != null) { try { return converter.convert(value); @@ -706,13 +685,13 @@ import com.ibm.icu.text.NumberFormat; Policy.getLog().log(new Status(IStatus.ERROR, Activator.PLUGIN_ID, ex.getMessage(), ex)); } } - return value; + return (D) value; } /* * Default converter implementation, does not perform any conversion. */ - static final class DefaultConverter implements IConverter { + static final class DefaultConverter implements IConverter { private final Object toType; diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/UpdateValueStrategy.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/UpdateValueStrategy.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/UpdateValueStrategy.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/UpdateValueStrategy.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007, 2017 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation @@ -16,6 +19,7 @@ package org.eclipse.core.databinding; import java.util.Date; import java.util.HashMap; +import java.util.Map; import org.eclipse.core.databinding.conversion.IConverter; import org.eclipse.core.databinding.observable.value.IObservableValue; @@ -93,6 +97,14 @@ import org.eclipse.core.runtime.Status; * {@link #POLICY_UPDATE}). *

    * + * @param + * the type of the value on the source side (i.e. the model side if + * this is a model-to-target update and the target side if this is a + * target-to-model update) + * @param + * the type of the value on the destination side (i.e. the target + * side if this is a model-to-target update and the model side if + * this is a target-to-model update) * @see DataBindingContext#bindValue(IObservableValue, IObservableValue, * UpdateValueStrategy, UpdateValueStrategy) * @see Binding#getValidationStatus() @@ -100,7 +112,7 @@ import org.eclipse.core.runtime.Status; * @see IConverter * @since 1.0 */ -public class UpdateValueStrategy extends UpdateStrategy { +public class UpdateValueStrategy extends UpdateStrategy { /** * Policy constant denoting that the source observable's state should not be @@ -145,13 +157,14 @@ public class UpdateValueStrategy extends return i; } - protected IValidator afterGetValidator; - protected IValidator afterConvertValidator; - protected IValidator beforeSetValidator; + protected IValidator afterGetValidator; + protected IValidator afterConvertValidator; + protected IValidator beforeSetValidator; + private int updatePolicy; private static ValidatorRegistry validatorRegistry = new ValidatorRegistry(); - private static HashMap validatorsByConverter = new HashMap(); + private static HashMap, IValidator> validatorsByConverter = new HashMap<>(); protected boolean provideDefaults; @@ -211,7 +224,7 @@ public class UpdateValueStrategy extends * @param toType * @return an IValidator, or null if unsuccessful */ - protected IValidator createValidator(Object fromType, Object toType) { + protected IValidator createValidator(Object fromType, Object toType) { if (fromType == null || toType == null) { return value -> Status.OK_STATUS; } @@ -230,14 +243,13 @@ public class UpdateValueStrategy extends * @param source * @param destination */ - protected void fillDefaults(IObservableValue source, - IObservableValue destination) { + protected void fillDefaults(IObservableValue source, IObservableValue destination) { Object sourceType = source.getValueType(); Object destinationType = destination.getValueType(); if (provideDefaults && sourceType != null && destinationType != null) { if (converter == null) { - IConverter converter = createConverter(sourceType, - destinationType); + @SuppressWarnings("unchecked") + IConverter converter = (IConverter) createConverter(sourceType, destinationType); defaultedConverter = (converter != null); setConverter(converter); } @@ -258,41 +270,42 @@ public class UpdateValueStrategy extends } } - private IValidator findValidator(Object fromType, Object toType) { - IValidator result = null; + @SuppressWarnings("unchecked") + private IValidator findValidator(Object fromType, Object toType) { + IValidator result = null; // We only default the validator if we defaulted the converter since the // two are tightly coupled. if (defaultedConverter) { if (String.class.equals(fromType)) { - result = (IValidator) validatorsByConverter.get(converter); + result = validatorsByConverter.get(converter); if (result == null) { // TODO sring based lookup if (Integer.class.equals(toType) || Integer.TYPE.equals(toType)) { result = new StringToIntegerValidator( - (NumberFormatConverter) converter); + (NumberFormatConverter) converter); } else if (Long.class.equals(toType) || Long.TYPE.equals(toType)) { result = new StringToLongValidator( - (NumberFormatConverter) converter); + (NumberFormatConverter) converter); } else if (Float.class.equals(toType) || Float.TYPE.equals(toType)) { result = new StringToFloatValidator( - (NumberFormatConverter) converter); + (NumberFormatConverter) converter); } else if (Double.class.equals(toType) || Double.TYPE.equals(toType)) { result = new StringToDoubleValidator( - (NumberFormatConverter) converter); + (NumberFormatConverter) converter); } else if (Byte.class.equals(toType) || Byte.TYPE.equals(toType)) { result = new StringToByteValidator( - (NumberFormatConverter) converter); + (NumberFormatConverter) converter); } else if (Short.class.equals(toType) || Short.TYPE.equals(toType)) { result = new StringToShortValidator( - (NumberFormatConverter) converter); + (NumberFormatConverter) converter); } else if (Character.class.equals(toType) || Character.TYPE.equals(toType) && converter instanceof StringToCharacterConverter) { @@ -309,7 +322,7 @@ public class UpdateValueStrategy extends } } } else if (converter instanceof NumberToNumberConverter) { - result = (IValidator) validatorsByConverter.get(converter); + result = validatorsByConverter.get(converter); if (result == null) { if (converter instanceof NumberToByteConverter) { @@ -333,7 +346,7 @@ public class UpdateValueStrategy extends } else if (converter instanceof NumberToBigIntegerConverter || converter instanceof NumberToBigDecimalConverter) { result = new NumberToUnboundedNumberValidator( - (NumberToNumberConverter) converter); + (NumberToNumberConverter) converter); } } } @@ -344,7 +357,7 @@ public class UpdateValueStrategy extends } } - return result; + return (IValidator) result; } /** @@ -361,7 +374,7 @@ public class UpdateValueStrategy extends * @param validator * @return the receiver, to enable method call chaining */ - public UpdateValueStrategy setAfterConvertValidator(IValidator validator) { + public UpdateValueStrategy setAfterConvertValidator(IValidator validator) { this.afterConvertValidator = validator; return this; } @@ -373,7 +386,7 @@ public class UpdateValueStrategy extends * @param validator * @return the receiver, to enable method call chaining */ - public UpdateValueStrategy setAfterGetValidator(IValidator validator) { + public UpdateValueStrategy setAfterGetValidator(IValidator validator) { this.afterGetValidator = validator; return this; } @@ -385,7 +398,7 @@ public class UpdateValueStrategy extends * @param validator * @return the receiver, to enable method call chaining */ - public UpdateValueStrategy setBeforeSetValidator(IValidator validator) { + public UpdateValueStrategy setBeforeSetValidator(IValidator validator) { this.beforeSetValidator = validator; return this; } @@ -397,7 +410,7 @@ public class UpdateValueStrategy extends * @param converter * @return the receiver, to enable method call chaining */ - public UpdateValueStrategy setConverter(IConverter converter) { + public UpdateValueStrategy setConverter(IConverter converter) { this.converter = converter; return this; } @@ -413,7 +426,7 @@ public class UpdateValueStrategy extends * @param value * @return an ok status */ - public IStatus validateAfterConvert(Object value) { + public IStatus validateAfterConvert(D value) { return afterConvertValidator == null ? Status.OK_STATUS : afterConvertValidator.validate(value); } @@ -429,7 +442,7 @@ public class UpdateValueStrategy extends * @param value * @return an ok status */ - public IStatus validateAfterGet(Object value) { + public IStatus validateAfterGet(S value) { return afterGetValidator == null ? Status.OK_STATUS : afterGetValidator .validate(value); } @@ -445,7 +458,7 @@ public class UpdateValueStrategy extends * @param value * @return an ok status */ - public IStatus validateBeforeSet(Object value) { + public IStatus validateBeforeSet(D value) { return beforeSetValidator == null ? Status.OK_STATUS : beforeSetValidator.validate(value); } @@ -458,7 +471,7 @@ public class UpdateValueStrategy extends * @param value * @return status */ - protected IStatus doSet(IObservableValue observableValue, Object value) { + protected IStatus doSet(IObservableValue observableValue, D value) { try { observableValue.setValue(value); } catch (Exception ex) { @@ -469,7 +482,7 @@ public class UpdateValueStrategy extends private static class ValidatorRegistry { - private HashMap validators = new HashMap(); + private Map> validators = new HashMap>(); /** * Adds the system-provided validators to the current validator @@ -520,8 +533,7 @@ public class UpdateValueStrategy extends * @param validator * The IValidator */ - private void associate(Object fromClass, Object toClass, - IValidator validator) { + private void associate(Object fromClass, Object toClass, IValidator validator) { validators.put(new Pair(fromClass, toClass), validator); } @@ -534,9 +546,8 @@ public class UpdateValueStrategy extends * The Class to convert to * @return An appropriate IValidator */ - private IValidator get(Object fromClass, Object toClass) { - IValidator result = (IValidator) validators.get(new Pair(fromClass, - toClass)); + private IValidator get(Object fromClass, Object toClass) { + IValidator result = validators.get(new Pair(fromClass, toClass)); if (result != null) return result; if (fromClass != null && toClass != null && fromClass == toClass) { @@ -554,7 +565,7 @@ public class UpdateValueStrategy extends * @return the update value strategy * @since 1.6 */ - public static UpdateValueStrategy create(IConverter converter) { - return new UpdateValueStrategy().setConverter(converter); + public static UpdateValueStrategy create(IConverter converter) { + return new UpdateValueStrategy().setConverter(converter); } } diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/validation/IValidator.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/validation/IValidator.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/validation/IValidator.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/validation/IValidator.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation @@ -19,11 +22,12 @@ import org.eclipse.core.runtime.IStatus; * converted to an integer value, and a PositiveIntegerValidator would only * accept positive integers. * + * @param + * type of object being validated * @since 1.0 - * */ @FunctionalInterface -public interface IValidator { +public interface IValidator { /** * Determines if the given value is valid. @@ -33,6 +37,6 @@ public interface IValidator { * @return a status object indicating whether the validation succeeded * {@link IStatus#isOK()} or not. Never null. */ - public IStatus validate(Object value); + public IStatus validate(T value); } diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/validation/MultiValidator.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/validation/MultiValidator.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/validation/MultiValidator.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/validation/MultiValidator.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2017 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 218269) @@ -124,26 +127,26 @@ import org.eclipse.core.runtime.IStatus; public abstract class MultiValidator extends ValidationStatusProvider { private Realm realm; private ValidationStatusObservableValue validationStatus; - private IObservableValue unmodifiableValidationStatus; - private WritableList targets; - private IObservableList unmodifiableTargets; - private IObservableList models; + private IObservableValue unmodifiableValidationStatus; + private WritableList targets; + private IObservableList unmodifiableTargets; + private IObservableList models; - IListChangeListener targetsListener = event -> event.diff.accept(new ListDiffVisitor() { - @Override - public void handleAdd(int index, Object element) { - IObservable dependency = (IObservable) element; - dependency.addChangeListener(dependencyListener); - dependency.addStaleListener(dependencyListener); - } + IListChangeListener targetsListener = event -> { + event.diff.accept(new ListDiffVisitor() { + @Override + public void handleAdd(int index, IObservable dependency) { + dependency.addChangeListener(dependencyListener); + dependency.addStaleListener(dependencyListener); + } - @Override - public void handleRemove(int index, Object element) { - IObservable dependency = (IObservable) element; - dependency.removeChangeListener(dependencyListener); - dependency.removeStaleListener(dependencyListener); - } - }); + @Override + public void handleRemove(int index, IObservable dependency) { + dependency.removeChangeListener(dependencyListener); + dependency.removeStaleListener(dependencyListener); + } + }); + }; private class DependencyListener implements IChangeListener, IStaleListener { @Override @@ -180,11 +183,9 @@ public abstract class MultiValidator ext try { validationStatus = new ValidationStatusObservableValue(realm); - targets = new WritableList(realm, new ArrayList(), - IObservable.class); + targets = new WritableList<>(realm, new ArrayList(), IObservable.class); targets.addListChangeListener(targetsListener); - unmodifiableTargets = Observables - .unmodifiableObservableList(targets); + unmodifiableTargets = Observables.unmodifiableObservableList(targets); models = Observables.emptyObservableList(realm); } finally { @@ -194,9 +195,8 @@ public abstract class MultiValidator ext private void checkObservable(IObservable target) { Assert.isNotNull(target, "Target observable cannot be null"); //$NON-NLS-1$ - Assert - .isTrue(realm.equals(target.getRealm()), - "Target observable must be in the same realm as MultiValidator"); //$NON-NLS-1$ + Assert.isTrue(realm.equals(target.getRealm()), + "Target observable must be in the same realm as MultiValidator"); //$NON-NLS-1$ } /** @@ -208,7 +208,7 @@ public abstract class MultiValidator ext * validation status of this MultiValidator. */ @Override - public IObservableValue getValidationStatus() { + public IObservableValue getValidationStatus() { if (unmodifiableValidationStatus == null) { ObservableTracker.setIgnore(true); try { @@ -263,12 +263,12 @@ public abstract class MultiValidator ext ObservableTracker.setIgnore(true); try { - List newTargets = new ArrayList(Arrays.asList(dependencies)); + List newTargets = new ArrayList<>(Arrays.asList(dependencies)); // Internal observables should not be dependencies // (prevent dependency loop) - for (Iterator itNew = newTargets.iterator(); itNew.hasNext();) { - Object newDependency = itNew.next(); + for (Iterator itNew = newTargets.iterator(); itNew.hasNext();) { + IObservable newDependency = itNew.next(); if (newDependency == validationStatus || newDependency == unmodifiableValidationStatus || newDependency == targets @@ -284,8 +284,8 @@ public abstract class MultiValidator ext // Except that dependencies are compared by identity instead of // equality outer: for (int i = targets.size() - 1; i >= 0; i--) { - Object oldDependency = targets.get(i); - for (Iterator itNew = newTargets.iterator(); itNew.hasNext();) { + IObservable oldDependency = targets.get(i); + for (Iterator itNew = newTargets.iterator(); itNew.hasNext();) { Object newDependency = itNew.next(); if (oldDependency == newDependency) { // Dependency is already known--remove from list of @@ -348,9 +348,9 @@ public abstract class MultiValidator ext * @return an IObservableValue which stays in sync with the given target * observable only with the validation status is valid. */ - public IObservableValue observeValidatedValue(IObservableValue target) { + public IObservableValue observeValidatedValue(IObservableValue target) { checkObservable(target); - return new ValidatedObservableValue(target, getValidationStatus()); + return new ValidatedObservableValue<>(target, getValidationStatus()); } /** @@ -375,9 +375,9 @@ public abstract class MultiValidator ext * @return an IObservableValue which stays in sync with the given target * observable only with the validation status is valid. */ - public IObservableList observeValidatedList(IObservableList target) { + public IObservableList observeValidatedList(IObservableList target) { checkObservable(target); - return new ValidatedObservableList(target, getValidationStatus()); + return new ValidatedObservableList<>(target, getValidationStatus()); } /** @@ -402,9 +402,9 @@ public abstract class MultiValidator ext * @return an IObservableValue which stays in sync with the given target * observable only with the validation status is valid. */ - public IObservableSet observeValidatedSet(IObservableSet target) { + public IObservableSet observeValidatedSet(IObservableSet target) { checkObservable(target); - return new ValidatedObservableSet(target, getValidationStatus()); + return new ValidatedObservableSet<>(target, getValidationStatus()); } /** @@ -429,18 +429,18 @@ public abstract class MultiValidator ext * @return an IObservableValue which stays in sync with the given target * observable only with the validation status is valid. */ - public IObservableMap observeValidatedMap(IObservableMap target) { + public IObservableMap observeValidatedMap(IObservableMap target) { checkObservable(target); - return new ValidatedObservableMap(target, getValidationStatus()); + return new ValidatedObservableMap<>(target, getValidationStatus()); } @Override - public IObservableList getTargets() { + public IObservableList getTargets() { return unmodifiableTargets; } @Override - public IObservableList getModels() { + public IObservableList getModels() { return models; } @@ -480,9 +480,8 @@ public abstract class MultiValidator ext super.dispose(); } - private class ValidationStatusObservableValue extends - AbstractObservableValue { - private Object value = ValidationStatus.ok(); + private class ValidationStatusObservableValue extends AbstractObservableValue { + private IStatus value = ValidationStatus.ok(); private boolean stale = false; @@ -491,26 +490,26 @@ public abstract class MultiValidator ext } @Override - protected Object doGetValue() { + protected IStatus doGetValue() { return value; } @Override - protected void doSetValue(Object value) { + protected void doSetValue(IStatus value) { boolean oldStale = stale; // Update the staleness state by checking whether any of the current // dependencies is stale. stale = false; - for (Iterator iter = targets.iterator(); iter.hasNext();) { - IObservable dependency = (IObservable) iter.next(); + for (Iterator iter = targets.iterator(); iter.hasNext();) { + IObservable dependency = iter.next(); if (dependency.isStale()) { stale = true; break; } } - Object oldValue = this.value; + IStatus oldValue = this.value; this.value = value; // If either becoming non-stale or setting a new value, we must fire diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/validation/ValidationStatus.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/validation/ValidationStatus.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/validation/ValidationStatus.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/validation/ValidationStatus.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/ValidationStatusProvider.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/ValidationStatusProvider.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/ValidationStatusProvider.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/ValidationStatusProvider.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boris Bokowski - initial API and implementation (bug 218269) @@ -30,30 +33,26 @@ public abstract class ValidationStatusPr protected boolean disposed = false; /** - * @return an {@link IObservableValue}< {@link IStatus} > containing - * the current validation status + * @return an {@link IObservableValue} containing the current validation + * status */ - public abstract IObservableValue getValidationStatus(); + public abstract IObservableValue getValidationStatus(); /** - * Returns an {@link IObservableList} < {@link IObservable} > - * containing the target observables (if any) that are being tracked by this - * validation status provider. + * Returns an {@link IObservableList} containing the target observables (if + * any) that are being tracked by this validation status provider. * - * @return an {@link IObservableList} < {@link IObservable} > (may be - * empty) + * @return an {@link IObservableList} (may be empty) */ - public abstract IObservableList getTargets(); + public abstract IObservableList getTargets(); /** - * Returns an {@link IObservableList} < {@link IObservable} > - * containing the model observables (if any) that are being tracked by this - * validation status provider. + * Returns an {@link IObservableList} containing the model observables (if + * any) that are being tracked by this validation status provider. * - * @return an {@link IObservableList} < {@link IObservable} > (may be - * empty) + * @return an {@link IObservableList} (may be empty) */ - public abstract IObservableList getModels(); + public abstract IObservableList getModels(); /** * Disposes of this ValidationStatusProvider. Subclasses may extend, but diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/ValueBinding.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/ValueBinding.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/ValueBinding.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/ValueBinding.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation @@ -28,31 +31,28 @@ import org.eclipse.core.runtime.Status; * @since 1.0 * */ -class ValueBinding extends Binding { - private final UpdateValueStrategy targetToModel; - private final UpdateValueStrategy modelToTarget; - private WritableValue validationStatusObservable; - private IObservableValue target; - private IObservableValue model; +class ValueBinding extends Binding { + private final UpdateValueStrategy targetToModel; + private final UpdateValueStrategy modelToTarget; + private WritableValue validationStatusObservable; + private IObservableValue target; + private IObservableValue model; private boolean updatingTarget; private boolean updatingModel; - private IValueChangeListener targetChangeListener = new IValueChangeListener() { + private IValueChangeListener targetChangeListener = new IValueChangeListener() { @Override - public void handleValueChange(ValueChangeEvent event) { - if (!updatingTarget - && !Util.equals(event.diff.getOldValue(), event.diff - .getNewValue())) { + public void handleValueChange(ValueChangeEvent event) { + if (!updatingTarget && !Util.equals(event.diff.getOldValue(), event.diff.getNewValue())) { doUpdate(target, model, targetToModel, false, false); } } }; - private IValueChangeListener modelChangeListener = new IValueChangeListener() { + + private IValueChangeListener modelChangeListener = new IValueChangeListener() { @Override - public void handleValueChange(ValueChangeEvent event) { - if (!updatingModel - && !Util.equals(event.diff.getOldValue(), event.diff - .getNewValue())) { + public void handleValueChange(ValueChangeEvent event) { + if (!updatingModel && !Util.equals(event.diff.getOldValue(), event.diff.getNewValue())) { doUpdate(model, target, modelToTarget, false, false); } } @@ -64,9 +64,9 @@ class ValueBinding extends Binding { * @param targetToModel * @param modelToTarget */ - public ValueBinding(IObservableValue targetObservableValue, - IObservableValue modelObservableValue, - UpdateValueStrategy targetToModel, UpdateValueStrategy modelToTarget) { + public ValueBinding(IObservableValue targetObservableValue, IObservableValue modelObservableValue, + UpdateValueStrategy targetToModel, + UpdateValueStrategy modelToTarget) { super(targetObservableValue, modelObservableValue); this.target = targetObservableValue; this.model = modelObservableValue; @@ -78,8 +78,8 @@ class ValueBinding extends Binding { protected void preInit() { ObservableTracker.setIgnore(true); try { - validationStatusObservable = new WritableValue(context - .getValidationRealm(), Status.OK_STATUS, IStatus.class); + validationStatusObservable = new WritableValue<>( + context.getValidationRealm(), Status.OK_STATUS, IStatus.class); } finally { ObservableTracker.setIgnore(false); } @@ -113,7 +113,7 @@ class ValueBinding extends Binding { } @Override - public IObservableValue getValidationStatus() { + public IObservableValue getValidationStatus() { return validationStatusObservable; } @@ -148,9 +148,9 @@ class ValueBinding extends Binding { * need more control over how the source value is copied to the destination * observable. */ - private void doUpdate(final IObservableValue source, - final IObservableValue destination, - final UpdateValueStrategy updateValueStrategy, + private void doUpdate(final IObservableValue source, + final IObservableValue destination, + final UpdateValueStrategy updateValueStrategy, final boolean explicit, final boolean validateOnly) { final int policy = updateValueStrategy.getUpdatePolicy(); @@ -164,7 +164,7 @@ class ValueBinding extends Binding { final MultiStatus multiStatus = BindingStatus.ok(); try { // Get value - Object value = source.getValue(); + S value = source.getValue(); // Validate after get IStatus status = updateValueStrategy.validateAfterGet(value); @@ -172,7 +172,7 @@ class ValueBinding extends Binding { return; // Convert value - final Object convertedValue = updateValueStrategy.convert(value); + final D2 convertedValue = updateValueStrategy.convert(value); // Validate after convert status = updateValueStrategy.validateAfterConvert(convertedValue); diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/Activator.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/Activator.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/Activator.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/Activator.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007, 2017 Tom Schindl and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Tom Schindl - initial API and implementation @@ -12,6 +15,7 @@ package org.eclipse.core.internal.databinding; import java.util.ArrayList; +import java.util.List; import org.eclipse.core.databinding.util.Policy; import org.eclipse.core.runtime.CoreException; @@ -32,7 +36,7 @@ public class Activator implements Bundle */ public static final String PLUGIN_ID = "org.eclipse.core.databinding"; //$NON-NLS-1$ - private volatile ServiceTracker _frameworkLogTracker; + private volatile ServiceTracker _frameworkLogTracker; /** * The constructor @@ -42,11 +46,11 @@ public class Activator implements Bundle @Override public void start(BundleContext context) throws Exception { - _frameworkLogTracker = new ServiceTracker(context, FrameworkLog.class.getName(), null); + _frameworkLogTracker = new ServiceTracker<>(context, FrameworkLog.class.getName(), null); _frameworkLogTracker.open(); Policy.setLog(status -> { - ServiceTracker frameworkLogTracker = _frameworkLogTracker; + ServiceTracker frameworkLogTracker = _frameworkLogTracker; FrameworkLog log = frameworkLogTracker == null ? null : (FrameworkLog) frameworkLogTracker.getService(); if (log != null) { log.log(createLogEntry(status)); @@ -64,7 +68,7 @@ public class Activator implements Bundle // hard? FrameworkLogEntry createLogEntry(IStatus status) { Throwable t = status.getException(); - ArrayList childlist = new ArrayList(); + List childlist = new ArrayList<>(); int stackCode = t instanceof CoreException ? 1 : 0; // ensure a substatus inside a CoreException is properly logged @@ -81,12 +85,12 @@ public class Activator implements Bundle } } - FrameworkLogEntry[] children = (FrameworkLogEntry[]) (childlist.isEmpty() ? null : childlist.toArray(new FrameworkLogEntry[childlist.size()])); + FrameworkLogEntry[] children = childlist.isEmpty() ? null : childlist.toArray(new FrameworkLogEntry[childlist.size()]); - return new FrameworkLogEntry(status.getPlugin(), status.getSeverity(), status.getCode(), status.getMessage(), stackCode, t, children); + return new FrameworkLogEntry(status.getPlugin(), status.getSeverity(), + status.getCode(), status.getMessage(), stackCode, t, children); } - @Override public void stop(BundleContext context) throws Exception { if (_frameworkLogTracker != null) { diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/BindingMessages.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/BindingMessages.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/BindingMessages.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/BindingMessages.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2008 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/BindingModelProperty.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/BindingModelProperty.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/BindingModelProperty.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/BindingModelProperty.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 263709) @@ -13,6 +16,7 @@ package org.eclipse.core.internal.databi import org.eclipse.core.databinding.Binding; import org.eclipse.core.databinding.observable.IObservable; +import org.eclipse.core.databinding.observable.value.ValueDiff; import org.eclipse.core.databinding.property.INativePropertyListener; import org.eclipse.core.databinding.property.ISimplePropertyListener; import org.eclipse.core.databinding.property.value.SimpleValueProperty; @@ -21,34 +25,33 @@ import org.eclipse.core.databinding.prop * @since 3.3 * */ -public class BindingModelProperty extends SimpleValueProperty { +public class BindingModelProperty extends SimpleValueProperty { @Override public Object getValueType() { return IObservable.class; } @Override - protected Object doGetValue(Object source) { - return ((Binding) source).getModel(); + protected IObservable doGetValue(Binding source) { + return source.getModel(); } @Override - protected void doSetValue(Object source, Object value) { + protected void doSetValue(Binding source, IObservable value) { // no setter API } @Override - public INativePropertyListener adaptListener( - ISimplePropertyListener listener) { + public INativePropertyListener adaptListener( + ISimplePropertyListener> listener) { // no listener API return null; } - protected void doAddListener(Object source, INativePropertyListener listener) { + protected void doAddListener(Binding source, INativePropertyListener listener) { } - protected void doRemoveListener(Object source, - INativePropertyListener listener) { + protected void doRemoveListener(Binding source, INativePropertyListener listener) { } @Override diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/BindingStatus.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/BindingStatus.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/BindingStatus.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/BindingStatus.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/BindingTargetProperty.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/BindingTargetProperty.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/BindingTargetProperty.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/BindingTargetProperty.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 263709) @@ -13,6 +16,7 @@ package org.eclipse.core.internal.databi import org.eclipse.core.databinding.Binding; import org.eclipse.core.databinding.observable.IObservable; +import org.eclipse.core.databinding.observable.value.ValueDiff; import org.eclipse.core.databinding.property.INativePropertyListener; import org.eclipse.core.databinding.property.ISimplePropertyListener; import org.eclipse.core.databinding.property.value.SimpleValueProperty; @@ -21,34 +25,35 @@ import org.eclipse.core.databinding.prop * @since 3.3 * */ -public class BindingTargetProperty extends SimpleValueProperty { +public class BindingTargetProperty extends SimpleValueProperty { @Override public Object getValueType() { return IObservable.class; } @Override - protected Object doGetValue(Object source) { - return ((Binding) source).getTarget(); + protected IObservable doGetValue(Binding source) { + return source.getTarget(); } @Override - protected void doSetValue(Object source, Object value) { + protected void doSetValue(Binding source, IObservable value) { // no setter API } @Override - public INativePropertyListener adaptListener( - ISimplePropertyListener listener) { + public INativePropertyListener adaptListener( + ISimplePropertyListener> listener) { // no listener API return null; } - protected void doAddListener(Object source, INativePropertyListener listener) { + protected void doAddListener(Binding source, + INativePropertyListener listener) { } - protected void doRemoveListener(Object source, - INativePropertyListener listener) { + protected void doRemoveListener(Binding source, + INativePropertyListener listener) { } @Override diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/ClassLookupSupport.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/ClassLookupSupport.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/ClassLookupSupport.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/ClassLookupSupport.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation @@ -28,43 +31,47 @@ public class ClassLookupSupport { /* * code copied from AdapterManager.java */ - private static HashMap classSearchOrderLookup; + private static HashMap, List>> classSearchOrderLookup; /** - * For a given class or interface, return an array containing the given type and all its direct and indirect supertypes. + * For a given class or interface, return an array containing the given type + * and all its direct and indirect supertypes. + * * @param type - * @return an array containing the given type and all its direct and indirect supertypes + * @return an array containing the given type and all its direct and + * indirect supertypes */ - public static Class[] getTypeHierarchyFlattened(Class type) { - List classes = null; - //cache reference to lookup to protect against concurrent flush - HashMap lookup = classSearchOrderLookup; + public static Class[] getTypeHierarchyFlattened(Class type) { + List> classes = null; + // cache reference to lookup to protect against concurrent flush + HashMap, List>> lookup = classSearchOrderLookup; if (lookup != null) - classes = (List) lookup.get(type); + classes = lookup.get(type); // compute class order only if it hasn't been cached before if (classes == null) { - classes = new ArrayList(); + classes = new ArrayList<>(); computeClassOrder(type, classes); if (lookup == null) - classSearchOrderLookup = lookup = new HashMap(); + classSearchOrderLookup = lookup = new HashMap<>(); lookup.put(type, classes); } - return (Class[]) classes.toArray(new Class[classes.size()]); + return classes.toArray(new Class[classes.size()]); } /** - * Builds and returns a table of adapters for the given adaptable type. - * The table is keyed by adapter class name. The - * value is the sole factory that defines that adapter. Note that - * if multiple adapters technically define the same property, only the - * first found in the search order is considered. + * Builds and returns a table of adapters for the given adaptable type. The + * table is keyed by adapter class name. The value is the sole factory + * that defines that adapter. Note that if multiple adapters technically + * define the same property, only the first found in the search order is + * considered. * * Note that it is important to maintain a consistent class and interface * lookup order. See the class comment for more details. */ - private static void computeClassOrder(Class adaptable, Collection classes) { - Class clazz = adaptable; - Set seen = new HashSet(4); + private static void computeClassOrder(Class adaptable, + Collection> classes) { + Class clazz = adaptable; + Set> seen = new HashSet<>(4); while (clazz != null) { classes.add(clazz); computeInterfaceOrder(clazz.getInterfaces(), classes, seen); @@ -72,18 +79,17 @@ public class ClassLookupSupport { } } - private static void computeInterfaceOrder(Class[] interfaces, Collection classes, Set seen) { - List newInterfaces = new ArrayList(interfaces.length); - for (Class interfaze : interfaces) { + private static void computeInterfaceOrder(Class[] interfaces, Collection> classes, Set> seen) { + List> newInterfaces = new ArrayList<>(interfaces.length); + for (Class interfaze : interfaces) { if (seen.add(interfaze)) { //note we cannot recurse here without changing the resulting interface order classes.add(interfaze); newInterfaces.add(interfaze); } } - for (Iterator it = newInterfaces.iterator(); it.hasNext();) - computeInterfaceOrder(((Class) it.next()).getInterfaces(), classes, seen); + for (Iterator> it = newInterfaces.iterator(); it.hasNext();) + computeInterfaceOrder(it.next().getInterfaces(), classes, seen); } - } diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/CharacterToStringConverter.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/CharacterToStringConverter.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/CharacterToStringConverter.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/CharacterToStringConverter.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007, 2014 Matt Carter and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matt Carter - initial API and implementation @@ -16,7 +19,7 @@ import org.eclipse.core.databinding.conv /** * Converts a character to a string. */ -public class CharacterToStringConverter extends Converter { +public class CharacterToStringConverter extends Converter { private final boolean primitive; /** @@ -28,7 +31,7 @@ public class CharacterToStringConverter } @Override - public Object convert(Object fromObject) { + public String convert(Object fromObject) { // Null is allowed when the type is not primitive. if (fromObject == null) { if (primitive) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/DateConversionSupport.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/DateConversionSupport.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/DateConversionSupport.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/DateConversionSupport.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,10 +1,13 @@ /******************************************************************************* * Copyright (C) 2005, 2009 db4objects Inc. http://www.db4o.com * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * db4objects - Initial API and implementation @@ -31,10 +34,10 @@ import com.ibm.icu.text.SimpleDateFormat *

    */ public abstract class DateConversionSupport { - private final static int DATE_FORMAT=DateFormat.SHORT; - private final static int DEFAULT_FORMATTER_INDEX=0; + private static final int DATE_FORMAT=DateFormat.SHORT; + private static final int DEFAULT_FORMATTER_INDEX=0; - private final static int NUM_VIRTUAL_FORMATTERS=1; + private static final int NUM_VIRTUAL_FORMATTERS=1; /** * Alternative formatters for date, time and date/time. diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/DateToStringConverter.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/DateToStringConverter.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/DateToStringConverter.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/DateToStringConverter.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,10 +1,13 @@ /* * Copyright (C) 2005, 2015 db4objects Inc. http://www.db4o.com * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * db4objects - Initial API and implementation @@ -15,18 +18,17 @@ import java.util.Date; import org.eclipse.core.databinding.conversion.IConverter; - /** - * Converts a Java.util.Date to a String using the current locale. Null date + * Converts a Java.util.Date to a String using the current locale. Null date * values are converted to an empty string. * * @since 1.0 */ -public class DateToStringConverter extends DateConversionSupport implements IConverter { +public class DateToStringConverter extends DateConversionSupport implements IConverter { @Override - public Object convert(Object source) { + public String convert(Date source) { if (source != null) - return format((Date)source); + return format(source); return ""; //$NON-NLS-1$ } diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/IdentityConverter.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/IdentityConverter.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/IdentityConverter.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/IdentityConverter.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,10 +1,13 @@ /* * Copyright (C) 2005, 2015 db4objects Inc. http://www.db4o.com and others. * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * db4objects - Initial API and implementation @@ -18,16 +21,16 @@ import org.eclipse.core.databinding.conv /** * TheIdentityConverter. Returns the source value (the identity function). */ -public class IdentityConverter implements IConverter { +public class IdentityConverter implements IConverter { - private Class fromType; + private Class fromType; - private Class toType; + private Class toType; /** * @param type */ - public IdentityConverter(Class type) { + public IdentityConverter(Class type) { this.fromType = type; this.toType = type; } @@ -36,12 +39,12 @@ public class IdentityConverter implement * @param fromType * @param toType */ - public IdentityConverter(Class fromType, Class toType) { + public IdentityConverter(Class fromType, Class toType) { this.fromType = fromType; this.toType = toType; } - private Class[][] primitiveMap = new Class[][] { + private Class[][] primitiveMap = new Class[][] { { Integer.TYPE, Integer.class }, { Short.TYPE, Short.class }, { Long.TYPE, Long.class }, { Double.TYPE, Double.class }, { Byte.TYPE, Byte.class }, { Float.TYPE, Float.class }, @@ -56,7 +59,7 @@ public class IdentityConverter implement } } if (source != null) { - Class sourceClass = source.getClass(); + Class sourceClass = source.getClass(); if (toType.isPrimitive() || sourceClass.isPrimitive()) { if (sourceClass.equals(toType) || isPrimitiveTypeMatchedWithBoxed(sourceClass, toType)) { @@ -80,9 +83,8 @@ public class IdentityConverter implement * @param toClass * @return true if sourceClass and toType are matched primitive/boxed types */ - public boolean isPrimitiveTypeMatchedWithBoxed(Class sourceClass, - Class toClass) { - for (Class[] primitiveTuple : primitiveMap) { + public boolean isPrimitiveTypeMatchedWithBoxed(Class sourceClass, Class toClass) { + for (Class[] primitiveTuple : primitiveMap) { if (toClass.equals(primitiveTuple[0]) && sourceClass.equals(primitiveTuple[1])) { return true; diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/IntegerToStringConverter.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/IntegerToStringConverter.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/IntegerToStringConverter.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/IntegerToStringConverter.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation @@ -25,18 +28,17 @@ import com.ibm.icu.text.NumberFormat; * * @since 1.0 */ -public class IntegerToStringConverter extends Converter { +public class IntegerToStringConverter extends Converter { private final boolean primitive; private final NumberFormat numberFormat; - private final Class boxedType; + private final Class boxedType; /** * @param numberFormat * @param fromType * @param boxedType */ - private IntegerToStringConverter(NumberFormat numberFormat, Class fromType, - Class boxedType) { + private IntegerToStringConverter(NumberFormat numberFormat, Class fromType, Class boxedType) { super(fromType, String.class); this.primitive = fromType.isPrimitive(); this.numberFormat = numberFormat; @@ -44,7 +46,7 @@ public class IntegerToStringConverter ex } @Override - public Object convert(Object fromObject) { + public String convert(Object fromObject) { // Null is allowed when the type is not primitve. if (fromObject == null && !primitive) { return ""; //$NON-NLS-1$ diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/NumberToBigDecimalConverter.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/NumberToBigDecimalConverter.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/NumberToBigDecimalConverter.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/NumberToBigDecimalConverter.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation @@ -13,8 +16,7 @@ package org.eclipse.core.internal.databi import java.math.BigDecimal; import java.math.BigInteger; - -import com.ibm.icu.text.NumberFormat; +import java.text.Format; /** * Converts from a Number to a BigDecimal. @@ -24,17 +26,17 @@ import com.ibm.icu.text.NumberFormat; * * @since 1.0 */ -public class NumberToBigDecimalConverter extends NumberToNumberConverter { +public class NumberToBigDecimalConverter extends NumberToNumberConverter { /** * @param numberFormat * @param fromType */ - public NumberToBigDecimalConverter(NumberFormat numberFormat, Class fromType) { + public NumberToBigDecimalConverter(Format numberFormat, Class fromType) { super(numberFormat, fromType, BigDecimal.class); } @Override - protected Number doConvert(Number number) { + protected BigDecimal doConvert(Number number) { if (number instanceof BigInteger) { return new BigDecimal((BigInteger) number); } diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/NumberToBigIntegerConverter.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/NumberToBigIntegerConverter.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/NumberToBigIntegerConverter.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/NumberToBigIntegerConverter.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation @@ -13,8 +16,7 @@ package org.eclipse.core.internal.databi import java.math.BigDecimal; import java.math.BigInteger; - -import com.ibm.icu.text.NumberFormat; +import java.text.Format; /** * Converts from a Number to a BigInteger. @@ -24,17 +26,17 @@ import com.ibm.icu.text.NumberFormat; * * @since 1.0 */ -public class NumberToBigIntegerConverter extends NumberToNumberConverter { +public class NumberToBigIntegerConverter extends NumberToNumberConverter { /** * @param numberFormat * @param fromType */ - public NumberToBigIntegerConverter(NumberFormat numberFormat, Class fromType) { + public NumberToBigIntegerConverter(Format numberFormat, Class fromType) { super(numberFormat, fromType, BigInteger.class); } @Override - protected Number doConvert(Number number) { + protected BigInteger doConvert(Number number) { return toBigDecimal(number).toBigInteger(); } diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/NumberToByteConverter.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/NumberToByteConverter.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/NumberToByteConverter.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/NumberToByteConverter.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation @@ -11,7 +14,7 @@ package org.eclipse.core.internal.databinding.conversion; -import com.ibm.icu.text.NumberFormat; +import java.text.Format; /** * Converts from a Number to a Byte. @@ -21,19 +24,18 @@ import com.ibm.icu.text.NumberFormat; * * @since 1.0 */ -public class NumberToByteConverter extends NumberToNumberConverter { +public class NumberToByteConverter extends NumberToNumberConverter { /** * @param numberFormat * @param fromType * @param primitive */ - public NumberToByteConverter(NumberFormat numberFormat, Class fromType, - boolean primitive) { + public NumberToByteConverter(Format numberFormat, Class fromType, boolean primitive) { super(numberFormat, fromType, (primitive) ? Byte.TYPE : Byte.class); } @Override - protected Number doConvert(Number number) { + protected Byte doConvert(Number number) { if (StringToNumberParser.inByteRange(number)) { return Byte.valueOf(number.byteValue()); } diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/NumberToDoubleConverter.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/NumberToDoubleConverter.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/NumberToDoubleConverter.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/NumberToDoubleConverter.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007, 2018 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation @@ -11,7 +14,7 @@ package org.eclipse.core.internal.databinding.conversion; -import com.ibm.icu.text.NumberFormat; +import java.text.Format; /** * Converts from a Number to a Double. @@ -21,20 +24,19 @@ import com.ibm.icu.text.NumberFormat; * * @since 1.0 */ -public class NumberToDoubleConverter extends NumberToNumberConverter { +public class NumberToDoubleConverter extends NumberToNumberConverter { /** * @param numberFormat * @param fromType * @param primitive */ - public NumberToDoubleConverter(NumberFormat numberFormat, Class fromType, - boolean primitive) { + public NumberToDoubleConverter(Format numberFormat, Class fromType, boolean primitive) { super(numberFormat, fromType, (primitive) ? Double.TYPE : Double.class); } @Override - protected Number doConvert(Number number) { + protected Double doConvert(Number number) { if (StringToNumberParser.inDoubleRange(number)) { return Double.valueOf(number.doubleValue()); } diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/NumberToFloatConverter.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/NumberToFloatConverter.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/NumberToFloatConverter.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/NumberToFloatConverter.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007, 2018 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation @@ -11,7 +14,7 @@ package org.eclipse.core.internal.databinding.conversion; -import com.ibm.icu.text.NumberFormat; +import java.text.Format; /** * Converts from a Number to a Float. @@ -20,19 +23,19 @@ import com.ibm.icu.text.NumberFormat; *

    * @since 1.0 */ -public class NumberToFloatConverter extends NumberToNumberConverter { +public class NumberToFloatConverter extends NumberToNumberConverter { /** * @param numberFormat * @param fromType * @param primitive */ - public NumberToFloatConverter(NumberFormat numberFormat, Class fromType, + public NumberToFloatConverter(Format numberFormat, Class fromType, boolean primitive) { super(numberFormat, fromType, (primitive) ? Float.TYPE : Float.class); } @Override - protected Number doConvert(Number number) { + protected Float doConvert(Number number) { if (StringToNumberParser.inFloatRange(number)) { return Float.valueOf(number.floatValue()); } diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/NumberToIntegerConverter.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/NumberToIntegerConverter.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/NumberToIntegerConverter.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/NumberToIntegerConverter.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation @@ -11,9 +14,7 @@ package org.eclipse.core.internal.databinding.conversion; -import org.eclipse.core.databinding.conversion.IConverter; - -import com.ibm.icu.text.NumberFormat; +import java.text.Format; /** * Converts from a Number to a Integer. @@ -22,21 +23,19 @@ import com.ibm.icu.text.NumberFormat; *

    * @since 1.0 */ -public class NumberToIntegerConverter extends NumberToNumberConverter implements - IConverter { +public class NumberToIntegerConverter extends NumberToNumberConverter { /** * @param numberFormat * @param fromType * @param primitive */ - public NumberToIntegerConverter(NumberFormat numberFormat, - Class fromType, boolean primitive) { + public NumberToIntegerConverter(Format numberFormat, Class fromType, boolean primitive) { super(numberFormat, fromType, (primitive) ? Integer.TYPE : Integer.class); } @Override - protected Number doConvert(Number number) { + protected Integer doConvert(Number number) { if (StringToNumberParser.inIntegerRange(number)) { return Integer.valueOf(number.intValue()); } diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/NumberToLongConverter.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/NumberToLongConverter.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/NumberToLongConverter.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/NumberToLongConverter.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation @@ -11,7 +14,7 @@ package org.eclipse.core.internal.databinding.conversion; -import com.ibm.icu.text.NumberFormat; +import java.text.Format; /** * Converts from a Number to a Long. @@ -20,19 +23,18 @@ import com.ibm.icu.text.NumberFormat; *

    * @since 1.0 */ -public class NumberToLongConverter extends NumberToNumberConverter { +public class NumberToLongConverter extends NumberToNumberConverter { /** * @param numberFormat * @param fromType * @param primitive */ - public NumberToLongConverter(NumberFormat numberFormat, Class fromType, - boolean primitive) { + public NumberToLongConverter(Format numberFormat, Class fromType, boolean primitive) { super(numberFormat, fromType, (primitive) ? Long.TYPE : Long.class); } @Override - protected Number doConvert(Number number) { + protected Long doConvert(Number number) { if (StringToNumberParser.inLongRange(number)) { return Long.valueOf(number.longValue()); } diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/NumberToNumberConverter.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/NumberToNumberConverter.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/NumberToNumberConverter.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/NumberToNumberConverter.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007, 2018 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation @@ -11,9 +14,9 @@ package org.eclipse.core.internal.databinding.conversion; -import org.eclipse.core.databinding.conversion.Converter; +import java.text.Format; -import com.ibm.icu.text.NumberFormat; +import org.eclipse.core.databinding.conversion.Converter; /** * Base class for number to number converters. @@ -21,16 +24,19 @@ import com.ibm.icu.text.NumberFormat; * This class is thread safe. *

    * + * @param + * type of the converted value + * * @since 1.0 */ -public abstract class NumberToNumberConverter extends Converter { - private NumberFormat numberFormat; +public abstract class NumberToNumberConverter extends Converter { + private Format numberFormat; private boolean primitive; private String outOfRangeMessage; - protected NumberToNumberConverter(NumberFormat numberFormat, + protected NumberToNumberConverter(Format numberFormat, Class fromType, Class toType) { super(fromType, toType); this.numberFormat = numberFormat; @@ -38,7 +44,7 @@ public abstract class NumberToNumberConv } @Override - public final Object convert(Object fromObject) { + public final T convert(Object fromObject) { if (fromObject == null) { if (primitive) { throw new IllegalArgumentException( @@ -54,7 +60,7 @@ public abstract class NumberToNumberConv } Number number = (Number) fromObject; - Number result = doConvert(number); + T result = doConvert(number); if (result != null) { return result; @@ -78,7 +84,7 @@ public abstract class NumberToNumberConv * @return number if conversion was successfule, null if the * number was out of range */ - protected abstract Number doConvert(Number number); + protected abstract T doConvert(Number number); /** * NumberFormat being used by the converter. Access to the format must be @@ -86,7 +92,7 @@ public abstract class NumberToNumberConv * * @return number format */ - public NumberFormat getNumberFormat() { + public Format getNumberFormat() { return numberFormat; } } diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/NumberToShortConverter.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/NumberToShortConverter.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/NumberToShortConverter.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/NumberToShortConverter.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007, 2014 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation @@ -11,7 +14,7 @@ package org.eclipse.core.internal.databinding.conversion; -import com.ibm.icu.text.NumberFormat; +import java.text.Format; /** * Converts from a Number to a Short. @@ -20,20 +23,18 @@ import com.ibm.icu.text.NumberFormat; *

    * @since 1.0 */ -public class NumberToShortConverter extends NumberToNumberConverter { +public class NumberToShortConverter extends NumberToNumberConverter { /** * @param numberFormat * @param fromType * @param primitive */ - public NumberToShortConverter(NumberFormat numberFormat, Class fromType, - boolean primitive) { - + public NumberToShortConverter(Format numberFormat, Class fromType, boolean primitive) { super(numberFormat, fromType, (primitive) ? Short.TYPE : Short.class); } @Override - protected Number doConvert(Number number) { + protected Short doConvert(Number number) { if (StringToNumberParser.inShortRange(number)) { return Short.valueOf(number.shortValue()); } diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/ObjectToStringConverter.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/ObjectToStringConverter.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/ObjectToStringConverter.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/ObjectToStringConverter.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,10 +1,13 @@ /* * Copyright (C) 2005, 2015 db4objects Inc. http://www.db4o.com * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * db4objects - Initial API and implementation @@ -16,8 +19,8 @@ import org.eclipse.core.databinding.conv /** * Converts any object to a string by calling its toString() method. */ -public class ObjectToStringConverter implements IConverter { - private final Class fromClass; +public class ObjectToStringConverter implements IConverter { + private final Class fromClass; /** * @@ -29,12 +32,12 @@ public class ObjectToStringConverter imp /** * @param fromClass */ - public ObjectToStringConverter(Class fromClass) { + public ObjectToStringConverter(Class fromClass) { this.fromClass = fromClass; } @Override - public Object convert(Object source) { + public String convert(Object source) { if (source == null) { return ""; //$NON-NLS-1$ } diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/StatusToStringConverter.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/StatusToStringConverter.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/StatusToStringConverter.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/StatusToStringConverter.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation @@ -12,7 +15,6 @@ package org.eclipse.core.internal.databinding.conversion; import org.eclipse.core.databinding.conversion.Converter; -import org.eclipse.core.databinding.conversion.IConverter; import org.eclipse.core.runtime.IStatus; /** @@ -21,7 +23,7 @@ import org.eclipse.core.runtime.IStatus; * * @since 1.0 */ -public class StatusToStringConverter extends Converter implements IConverter { +public class StatusToStringConverter extends Converter { /** * Constructs a new instance. */ @@ -30,13 +32,12 @@ public class StatusToStringConverter ext } @Override - public Object convert(Object fromObject) { + public String convert(IStatus fromObject) { if (fromObject == null) { throw new IllegalArgumentException( "Parameter 'fromObject' was null."); //$NON-NLS-1$ } - IStatus status = (IStatus) fromObject; - return status.getMessage(); + return fromObject.getMessage(); } } diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/StringToBooleanConverter.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/StringToBooleanConverter.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/StringToBooleanConverter.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/StringToBooleanConverter.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,10 +1,13 @@ /* * Copyright (C) 2005, 2015 db4objects Inc. http://www.db4o.com * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * db4objects - Initial API and implementation @@ -17,9 +20,8 @@ package org.eclipse.core.internal.databi public class StringToBooleanConverter extends StringToBooleanPrimitiveConverter { @Override - public Object convert(Object source) { - String sourceString = (String) source; - if ("".equals(sourceString.trim())) { //$NON-NLS-1$ + public Boolean convert(String source) { + if ("".equals(source.trim())) { //$NON-NLS-1$ return null; } return super.convert(source); diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/StringToBooleanPrimitiveConverter.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/StringToBooleanPrimitiveConverter.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/StringToBooleanPrimitiveConverter.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/StringToBooleanPrimitiveConverter.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,10 +1,13 @@ /* * Copyright (C) 2005, 2014 db4objects Inc. http://www.db4o.com * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * db4objects - Initial API and implementation @@ -23,7 +26,7 @@ import org.eclipse.core.internal.databin /** * StringToBooleanPrimitiveConverter. */ -public class StringToBooleanPrimitiveConverter implements IConverter { +public class StringToBooleanPrimitiveConverter implements IConverter { private static final String[] trueValues; private static final String[] falseValues; @@ -45,21 +48,20 @@ public class StringToBooleanPrimitiveCon * @return sorted array of values */ private static String[] valuesToSortedArray(String delimiter, String values) { - List list = new LinkedList(); + List list = new LinkedList<>(); StringTokenizer tokenizer = new StringTokenizer(values, delimiter); while (tokenizer.hasMoreTokens()) { list.add(tokenizer.nextToken().toUpperCase()); } - String[] array = (String[]) list.toArray(new String[list.size()]); + String[] array = list.toArray(new String[list.size()]); Arrays.sort(array); return array; } @Override - public Object convert(Object source) { - String s = (String) source; + public Boolean convert(String s) { s = s.toUpperCase(); if (Arrays.binarySearch(trueValues, s) > -1) { diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/StringToByteConverter.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/StringToByteConverter.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/StringToByteConverter.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/StringToByteConverter.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,10 +1,13 @@ /* * Copyright (C) 2005, 2015 db4objects Inc. http://www.db4o.com * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * db4objects - Initial API and implementation @@ -17,9 +20,13 @@ import org.eclipse.core.internal.databin import com.ibm.icu.text.NumberFormat; /** + * Note that this class does not have precise type parameters because it + * manually handles argument type mismatches and throws + * {@link IllegalArgumentException}. + * * @since 1.0 */ -public class StringToByteConverter extends NumberFormatConverter { +public class StringToByteConverter extends NumberFormatConverter { private String outOfRangeMessage; private NumberFormat numberFormat; private boolean primitive; @@ -28,7 +35,7 @@ public class StringToByteConverter exten * @param numberFormat * @param toType */ - private StringToByteConverter(NumberFormat numberFormat, Class toType) { + private StringToByteConverter(NumberFormat numberFormat, Class toType) { super(String.class, toType, numberFormat); primitive = toType.isPrimitive(); this.numberFormat = numberFormat; @@ -39,8 +46,7 @@ public class StringToByteConverter exten * @param primitive * @return converter */ - public static StringToByteConverter toByte(NumberFormat numberFormat, - boolean primitive) { + public static StringToByteConverter toByte(NumberFormat numberFormat, boolean primitive) { return new StringToByteConverter(numberFormat, (primitive) ? Byte.TYPE : Byte.class); } @@ -53,7 +59,7 @@ public class StringToByteConverter exten } @Override - public Object convert(Object fromObject) { + public Byte convert(Object fromObject) { ParseResult result = StringToNumberParser.parse(fromObject, numberFormat, primitive); diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/StringToCharacterConverter.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/StringToCharacterConverter.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/StringToCharacterConverter.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/StringToCharacterConverter.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,10 +1,13 @@ /* * Copyright (C) 2005, 2015 db4objects Inc. http://www.db4o.com * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * db4objects - Initial API and implementation @@ -17,7 +20,7 @@ import org.eclipse.core.databinding.conv /** * StringToCharacterConverter. */ -public class StringToCharacterConverter implements IConverter { +public class StringToCharacterConverter implements IConverter { private final boolean primitiveTarget; @@ -30,7 +33,7 @@ public class StringToCharacterConverter } @Override - public Object convert(Object source) { + public Character convert(Object source) { if (source != null && !(source instanceof String)) throw new IllegalArgumentException( "String2Character: Expected type String, got type [" + source.getClass().getName() + "]"); //$NON-NLS-1$ //$NON-NLS-2$ diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/StringToDateConverter.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/StringToDateConverter.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/StringToDateConverter.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/StringToDateConverter.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,10 +1,13 @@ /* * Copyright (C) 2005, 2015 db4objects Inc. http://www.db4o.com * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * db4objects - Initial API and implementation @@ -15,15 +18,14 @@ import java.util.Date; import org.eclipse.core.databinding.conversion.IConverter; - /** * Convert a String to a java.util.Date, respecting the current locale * * @since 1.0 */ -public class StringToDateConverter extends DateConversionSupport implements IConverter { +public class StringToDateConverter extends DateConversionSupport implements IConverter { @Override - public Object convert(Object source) { + public Date convert(Object source) { return parse(source.toString()); } diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/StringToNumberParser.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/StringToNumberParser.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/StringToNumberParser.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/StringToNumberParser.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* - * Copyright (c) 2007, 2015 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 + * Copyright (c) 2007, 2018 IBM Corporation and others. + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation @@ -13,6 +16,7 @@ package org.eclipse.core.internal.databi import java.math.BigDecimal; import java.math.BigInteger; +import java.text.Format; import java.text.ParsePosition; import org.eclipse.core.internal.databinding.BindingMessages; @@ -135,7 +139,7 @@ public class StringToNumberParser { * @return message */ public static String createOutOfRangeMessage(Number minValue, - Number maxValue, NumberFormat numberFormat) { + Number maxValue, Format numberFormat) { String min = null; String max = null; @@ -176,9 +180,7 @@ public class StringToNumberParser { bigInteger = BigInteger.valueOf(number.longValue()); } else if (number instanceof Float || number instanceof Double) { double doubleValue = number.doubleValue(); - if (!Double.isNaN(doubleValue) - && doubleValue != Double.NEGATIVE_INFINITY - && doubleValue != Double.POSITIVE_INFINITY) { + if (!Double.isNaN(doubleValue) && !Double.isInfinite(doubleValue)) { bigInteger = new BigDecimal(doubleValue).toBigInteger(); } else { return false; @@ -240,9 +242,7 @@ public class StringToNumberParser { } else if (number instanceof Float || number instanceof Double) { double doubleValue = number.doubleValue(); - if (!Double.isNaN(doubleValue) - && doubleValue != Double.NEGATIVE_INFINITY - && doubleValue != Double.POSITIVE_INFINITY) { + if (!Double.isNaN(doubleValue) && !Double.isInfinite(doubleValue)) { bigDecimal = new BigDecimal(doubleValue); } else { return false; @@ -262,7 +262,13 @@ public class StringToNumberParser { // clause and the if condition below, they were commented because // the // compiler complained about dead code.. - bigDecimal = new BigDecimal(number.doubleValue()); + double doubleValue = number.doubleValue(); + + if (!Double.isNaN(doubleValue) && !Double.isInfinite(doubleValue)) { + bigDecimal = new BigDecimal(doubleValue); + } else { + return false; + } } /* if (bigDecimal != null) */{ diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/StringToShortConverter.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/StringToShortConverter.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/StringToShortConverter.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/StringToShortConverter.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007, 2018 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation @@ -17,9 +20,13 @@ import org.eclipse.core.internal.databin import com.ibm.icu.text.NumberFormat; /** + * Note that this class does not have precise type parameters because it + * manually handles argument type mismatches and throws + * {@link IllegalArgumentException}. + * * @since 1.0 */ -public class StringToShortConverter extends NumberFormatConverter { +public class StringToShortConverter extends NumberFormatConverter { private final NumberFormat numberFormat; private final boolean primitive; @@ -35,7 +42,7 @@ public class StringToShortConverter exte } @Override - public Object convert(Object fromObject) { + public Short convert(Object fromObject) { ParseResult result = StringToNumberParser.parse(fromObject, numberFormat, primitive); diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/ConverterValueProperty.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/ConverterValueProperty.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/ConverterValueProperty.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/ConverterValueProperty.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2010, 2015 Ovidio Mallo and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Ovidio Mallo - initial API and implementation (bug 306611) @@ -12,6 +15,7 @@ package org.eclipse.core.internal.databinding; import org.eclipse.core.databinding.conversion.IConverter; +import org.eclipse.core.databinding.observable.value.ValueDiff; import org.eclipse.core.databinding.property.INativePropertyListener; import org.eclipse.core.databinding.property.ISimplePropertyListener; import org.eclipse.core.databinding.property.value.SimpleValueProperty; @@ -19,10 +23,15 @@ import org.eclipse.core.databinding.prop /** * Simple value property which applies a given converter on a source object in * order to produce the property's value. + * + * @param + * type of the source object + * @param + * type of the value of the property (after conversion) */ -public class ConverterValueProperty extends SimpleValueProperty { +public class ConverterValueProperty extends SimpleValueProperty { - private final IConverter converter; + private final IConverter converter; /** * Creates a new value property which applies the given converter on the @@ -31,7 +40,7 @@ public class ConverterValueProperty exte * @param converter * The converter to apply to the source object. */ - public ConverterValueProperty(IConverter converter) { + public ConverterValueProperty(IConverter converter) { this.converter = converter; } @@ -42,27 +51,27 @@ public class ConverterValueProperty exte } @Override - public Object getValue(Object source) { + public T getValue(S source) { // We do also pass null values to the converter. return doGetValue(source); } @Override - protected Object doGetValue(Object source) { + protected T doGetValue(S source) { // delegate to the IConverter return converter.convert(source); } @Override - protected void doSetValue(Object source, Object value) { + protected void doSetValue(S source, T value) { // setting a value is not supported throw new UnsupportedOperationException(toString() + ": Setter not supported on a converted value!"); //$NON-NLS-1$ } @Override - public INativePropertyListener adaptListener( - ISimplePropertyListener listener) { + public INativePropertyListener adaptListener( + ISimplePropertyListener> listener) { // no listener API return null; } diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/DataBindingContextBindingsProperty.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/DataBindingContextBindingsProperty.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/DataBindingContextBindingsProperty.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/DataBindingContextBindingsProperty.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 263709) @@ -24,30 +27,30 @@ import org.eclipse.core.databinding.prop * @since 3.3 * */ -public final class DataBindingContextBindingsProperty extends ListProperty { +public final class DataBindingContextBindingsProperty extends ListProperty { @Override public Object getElementType() { return Binding.class; } @Override - protected List doGetList(Object source) { - return ((DataBindingContext) source).getBindings(); + protected List doGetList(DataBindingContext source) { + return source.getBindings(); } @Override - protected void doSetList(Object source, List list) { + protected void doSetList(DataBindingContext source, List list) { throw new UnsupportedOperationException(toString() + " is unmodifiable"); //$NON-NLS-1$ } @Override - protected void doUpdateList(Object source, ListDiff diff) { + protected void doUpdateList(DataBindingContext source, ListDiff diff) { throw new UnsupportedOperationException(toString() + " is unmodifiable"); //$NON-NLS-1$ } @Override - public IObservableList observe(Realm realm, Object source) { - return ((DataBindingContext) source).getBindings(); + public IObservableList observe(Realm realm, DataBindingContext source) { + return source.getBindings(); } @Override diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/DataBindingContextValidationStatusProvidersProperty.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/DataBindingContextValidationStatusProvidersProperty.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/DataBindingContextValidationStatusProvidersProperty.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/DataBindingContextValidationStatusProvidersProperty.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 263709) @@ -24,31 +27,32 @@ import org.eclipse.core.databinding.prop * @since 3.3 * */ -public final class DataBindingContextValidationStatusProvidersProperty extends - ListProperty { +public final class DataBindingContextValidationStatusProvidersProperty + extends ListProperty { @Override public Object getElementType() { return ValidationStatusProvider.class; } @Override - protected List doGetList(Object source) { - return ((DataBindingContext) source).getValidationStatusProviders(); + protected List doGetList(DataBindingContext source) { + return source.getValidationStatusProviders(); } @Override - protected void doSetList(Object source, List list) { + protected void doSetList(DataBindingContext source, List list) { throw new UnsupportedOperationException(toString() + " is unmodifiable"); //$NON-NLS-1$ } @Override - protected void doUpdateList(Object source, ListDiff diff) { + protected void doUpdateList(DataBindingContext source, ListDiff diff) { throw new UnsupportedOperationException(toString() + " is unmodifiable"); //$NON-NLS-1$ } @Override - public IObservableList observe(Realm realm, Object source) { - return ((DataBindingContext) source).getValidationStatusProviders(); + public IObservableList observe(Realm realm, + DataBindingContext source) { + return source.getValidationStatusProviders(); } @Override diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/IdentityMap.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/IdentityMap.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/IdentityMap.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/IdentityMap.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 215531) @@ -32,16 +35,20 @@ import org.eclipse.core.runtime.Assert; * It intentionally violates the {@link Map} contract, which requires the use of * {@link #equals(Object)} when comparing keys. * + * @param + * the type of the keys in the map + * @param + * the type of the values in the map * @since 1.2 */ -public class IdentityMap implements Map { - private Map wrappedMap; +public class IdentityMap implements Map { + private Map, V> wrappedMap; /** * Constructs an IdentityMap. */ public IdentityMap() { - this.wrappedMap = new HashMap(); + this.wrappedMap = new HashMap<>(); } /** @@ -51,7 +58,7 @@ public class IdentityMap implements Map * @param map * the map whose entries are to be added to this map. */ - public IdentityMap(Map map) { + public IdentityMap(Map map) { this(); Assert.isNotNull(map); putAll(map); @@ -73,16 +80,16 @@ public class IdentityMap implements Map } @Override - public Set entrySet() { - final Set wrappedEntrySet = wrappedMap.entrySet(); - return new Set() { + public Set> entrySet() { + final Set, V>> wrappedEntrySet = wrappedMap.entrySet(); + return new Set>() { @Override - public boolean add(Object o) { + public boolean add(Entry o) { throw new UnsupportedOperationException(); } @Override - public boolean addAll(Collection c) { + public boolean addAll(Collection> c) { throw new UnsupportedOperationException(); } @@ -93,16 +100,16 @@ public class IdentityMap implements Map @Override public boolean contains(Object o) { - for (Iterator iterator = iterator(); iterator.hasNext();) - if (iterator.next().equals(o)) + for (Entry entry : this) + if (entry.equals(o)) return true; return false; } @Override - public boolean containsAll(Collection c) { - for (Iterator iterator = c.iterator(); iterator.hasNext();) - if (!contains(iterator.next())) + public boolean containsAll(Collection c) { + for (Object element : c) + if (!contains(element)) return false; return true; } @@ -113,32 +120,31 @@ public class IdentityMap implements Map } @Override - public Iterator iterator() { - final Iterator wrappedIterator = wrappedEntrySet.iterator(); - return new Iterator() { + public Iterator> iterator() { + final Iterator, V>> wrappedIterator = wrappedEntrySet.iterator(); + return new Iterator>() { @Override public boolean hasNext() { return wrappedIterator.hasNext(); } @Override - public Object next() { - final Map.Entry wrappedEntry = (Map.Entry) wrappedIterator + public Entry next() { + final Entry, V> wrappedEntry = wrappedIterator .next(); - return new Map.Entry() { + return new Entry() { @Override - public Object getKey() { - return ((IdentityWrapper) wrappedEntry.getKey()) - .unwrap(); + public K getKey() { + return wrappedEntry.getKey().unwrap(); } @Override - public Object getValue() { + public V getValue() { return wrappedEntry.getValue(); } @Override - public Object setValue(Object value) { + public V setValue(V value) { return wrappedEntry.setValue(value); } @@ -146,12 +152,11 @@ public class IdentityMap implements Map public boolean equals(Object obj) { if (obj == this) return true; - if (obj == null || !(obj instanceof Map.Entry)) + if (obj == null || !(obj instanceof Entry)) return false; - Map.Entry that = (Map.Entry) obj; + Entry that = (Entry) obj; return this.getKey() == that.getKey() - && Util.equals(this.getValue(), that - .getValue()); + && Util.equals(this.getValue(), that.getValue()); } @Override @@ -170,12 +175,12 @@ public class IdentityMap implements Map @Override public boolean remove(Object o) { - final Map.Entry unwrappedEntry = (Map.Entry) o; - final IdentityWrapper wrappedKey = IdentityWrapper - .wrap(unwrappedEntry.getKey()); - Map.Entry wrappedEntry = new Map.Entry() { + final Entry unwrappedEntry = (Entry) o; + Object key = unwrappedEntry.getKey(); + final IdentityWrapper wrappedKey = IdentityWrapper.wrap(key); + Entry, Object> wrappedEntry = new Entry, Object>() { @Override - public Object getKey() { + public IdentityWrapper getKey() { return wrappedKey; } @@ -193,13 +198,11 @@ public class IdentityMap implements Map public boolean equals(Object obj) { if (obj == this) return true; - if (obj == null || !(obj instanceof Map.Entry)) + if (obj == null || !(obj instanceof Entry)) return false; - Map.Entry that = (Map.Entry) obj; + Entry that = (Entry) obj; return Util.equals(wrappedKey, that.getKey()) - && Util - .equals(this.getValue(), that - .getValue()); + && Util.equals(this.getValue(), that.getValue()); } @Override @@ -213,18 +216,18 @@ public class IdentityMap implements Map } @Override - public boolean removeAll(Collection c) { + public boolean removeAll(Collection c) { boolean changed = false; - for (Iterator iterator = c.iterator(); iterator.hasNext();) - changed |= remove(iterator.next()); + for (Object element : c) + changed |= remove(element); return changed; } @Override - public boolean retainAll(Collection c) { + public boolean retainAll(Collection c) { boolean changed = false; Object[] toRetain = c.toArray(); - outer: for (Iterator iterator = iterator(); iterator.hasNext();) { + outer: for (Iterator iterator = iterator(); iterator.hasNext();) { Object entry = iterator.next(); for (int i = 0; i < toRetain.length; i++) if (entry.equals(toRetain[i])) @@ -245,17 +248,16 @@ public class IdentityMap implements Map return toArray(new Object[size()]); } + @SuppressWarnings("unchecked") @Override - public Object[] toArray(Object[] a) { + public T[] toArray(T[] a) { int size = size(); if (a.length < size) { - a = (Object[]) Array.newInstance(a.getClass() - .getComponentType(), size); + a = (T[]) Array.newInstance(a.getClass().getComponentType(), size); } int i = 0; - for (Iterator iterator = iterator(); iterator.hasNext();) { - a[i] = iterator.next(); - i++; + for (Entry entry : this) { + a[i++] = (T) entry; } return a; } @@ -266,7 +268,7 @@ public class IdentityMap implements Map return true; if (obj == null || !(obj instanceof Set)) return false; - Set that = (Set) obj; + Set that = (Set) obj; return this.size() == that.size() && containsAll(that); } @@ -278,7 +280,7 @@ public class IdentityMap implements Map } @Override - public Object get(Object key) { + public V get(Object key) { return wrappedMap.get(IdentityWrapper.wrap(key)); } @@ -288,16 +290,16 @@ public class IdentityMap implements Map } @Override - public Set keySet() { - final Set wrappedKeySet = wrappedMap.keySet(); - return new Set() { + public Set keySet() { + final Set> wrappedKeySet = wrappedMap.keySet(); + return new Set() { @Override - public boolean add(Object o) { + public boolean add(K o) { throw new UnsupportedOperationException(); } @Override - public boolean addAll(Collection c) { + public boolean addAll(Collection c) { throw new UnsupportedOperationException(); } @@ -312,10 +314,9 @@ public class IdentityMap implements Map } @Override - public boolean containsAll(Collection c) { - for (Iterator iterator = c.iterator(); iterator.hasNext();) - if (!wrappedKeySet.contains(IdentityWrapper.wrap(iterator - .next()))) + public boolean containsAll(Collection c) { + for (Object element : c) + if (!wrappedKeySet.contains(IdentityWrapper.wrap(element))) return false; return true; } @@ -326,18 +327,17 @@ public class IdentityMap implements Map } @Override - public Iterator iterator() { - final Iterator wrappedIterator = wrappedKeySet.iterator(); - return new Iterator() { + public Iterator iterator() { + final Iterator> wrappedIterator = wrappedKeySet.iterator(); + return new Iterator() { @Override public boolean hasNext() { return wrappedIterator.hasNext(); } @Override - public Object next() { - return ((IdentityWrapper) wrappedIterator.next()) - .unwrap(); + public K next() { + return wrappedIterator.next().unwrap(); } @Override @@ -353,20 +353,19 @@ public class IdentityMap implements Map } @Override - public boolean removeAll(Collection c) { + public boolean removeAll(Collection c) { boolean changed = false; - for (Iterator iterator = c.iterator(); iterator.hasNext();) + for (Object element : c) changed |= wrappedKeySet.remove(IdentityWrapper - .wrap(iterator.next())); + .wrap(element)); return changed; } @Override - public boolean retainAll(Collection c) { + public boolean retainAll(Collection c) { boolean changed = false; Object[] toRetain = c.toArray(); - outer: for (Iterator iterator = iterator(); iterator.hasNext();) { - Object element = iterator.next(); + outer: for (Object element : this) { for (int i = 0; i < toRetain.length; i++) if (element == toRetain[i]) continue outer; @@ -387,18 +386,18 @@ public class IdentityMap implements Map return toArray(new Object[wrappedKeySet.size()]); } + @SuppressWarnings("unchecked") @Override - public Object[] toArray(Object[] a) { + public T[] toArray(T[] a) { int size = wrappedKeySet.size(); - IdentityWrapper[] wrappedArray = (IdentityWrapper[]) wrappedKeySet - .toArray(new IdentityWrapper[size]); - Object[] result = a; + T[] result = a; if (a.length < size) { - result = (Object[]) Array.newInstance(a.getClass() - .getComponentType(), size); + result = (T[]) Array.newInstance(a.getClass().getComponentType(), size); + } + int i = 0; + for (IdentityWrapper wrapper : wrappedKeySet) { + result[i++] = (T) wrapper.unwrap(); } - for (int i = 0; i < size; i++) - result[i] = wrappedArray[i].unwrap(); return result; } @@ -408,7 +407,7 @@ public class IdentityMap implements Map return true; if (obj == null || !(obj instanceof Set)) return false; - Set that = (Set) obj; + Set that = (Set) obj; return this.size() == that.size() && containsAll(that); } @@ -420,22 +419,21 @@ public class IdentityMap implements Map } @Override - public Object put(Object key, Object value) { + public V put(K key, V value) { return wrappedMap.put(IdentityWrapper.wrap(key), value); } @Override - public void putAll(Map other) { - for (Iterator iterator = other.entrySet().iterator(); iterator - .hasNext();) { - Map.Entry entry = (Map.Entry) iterator.next(); - wrappedMap.put(IdentityWrapper.wrap(entry.getKey()), entry - .getValue()); + public void putAll(Map other) { + for (Entry entry : other.entrySet()) { + K key = entry.getKey(); + V value = entry.getValue(); + wrappedMap.put(IdentityWrapper.wrap(key), value); } } @Override - public Object remove(Object key) { + public V remove(Object key) { return wrappedMap.remove(IdentityWrapper.wrap(key)); } @@ -445,7 +443,7 @@ public class IdentityMap implements Map } @Override - public Collection values() { + public Collection values() { return wrappedMap.values(); } @@ -455,7 +453,7 @@ public class IdentityMap implements Map return true; if (obj == null || !(obj instanceof Map)) return false; - Map that = (Map) obj; + Map that = (Map) obj; return this.entrySet().equals(that.entrySet()); } diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/IdentitySet.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/IdentitySet.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/IdentitySet.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/IdentitySet.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,15 +1,19 @@ /******************************************************************************* * Copyright (c) 2008, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 215531) * Matthew Hall - bug 124684 * (through ViewerElementSet.java) * Matthew Hall - bugs 262269, 303847 + * Stefan Xenos - Bug 335792 ******************************************************************************/ package org.eclipse.core.internal.databinding; @@ -29,16 +33,18 @@ import java.util.Set; * It intentionally violates the {@link Set} contract, which requires the use of * {@link #equals(Object)} when comparing elements. * + * @param + * the type of the elements in this collection * @since 1.2 */ -public class IdentitySet implements Set { - private final Set wrappedSet; +public class IdentitySet implements Set { + private final Set> wrappedSet; /** * Constructs an IdentitySet. */ public IdentitySet() { - this.wrappedSet = new HashSet(); + this.wrappedSet = new HashSet<>(); } /** @@ -48,21 +54,22 @@ public class IdentitySet implements Set * @param collection * the collection whose elements are to be added to this set. */ - public IdentitySet(Collection collection) { + public IdentitySet(Collection collection) { this(); addAll(collection); } @Override - public boolean add(Object o) { + public boolean add(E o) { return wrappedSet.add(IdentityWrapper.wrap(o)); } @Override - public boolean addAll(Collection c) { + public boolean addAll(Collection c) { boolean changed = false; - for (Iterator iterator = c.iterator(); iterator.hasNext();) - changed |= wrappedSet.add(IdentityWrapper.wrap(iterator.next())); + for (E element : c) { + changed |= wrappedSet.add(IdentityWrapper.wrap(element)); + } return changed; } @@ -77,9 +84,9 @@ public class IdentitySet implements Set } @Override - public boolean containsAll(Collection c) { - for (Iterator iterator = c.iterator(); iterator.hasNext();) - if (!wrappedSet.contains(IdentityWrapper.wrap(iterator.next()))) + public boolean containsAll(Collection c) { + for (Object element : c) + if (!wrappedSet.contains(IdentityWrapper.wrap(element))) return false; return true; } @@ -90,17 +97,17 @@ public class IdentitySet implements Set } @Override - public Iterator iterator() { - final Iterator wrappedIterator = wrappedSet.iterator(); - return new Iterator() { + public Iterator iterator() { + final Iterator> wrappedIterator = wrappedSet.iterator(); + return new Iterator() { @Override public boolean hasNext() { return wrappedIterator.hasNext(); } @Override - public Object next() { - return ((IdentityWrapper) wrappedIterator.next()).unwrap(); + public E next() { + return wrappedIterator.next().unwrap(); } @Override @@ -116,22 +123,22 @@ public class IdentitySet implements Set } @Override - public boolean removeAll(Collection c) { + public boolean removeAll(Collection c) { boolean changed = false; - for (Iterator iterator = c.iterator(); iterator.hasNext();) - changed |= remove(iterator.next()); + for (Object element : c) + changed |= remove(element); return changed; } @Override - public boolean retainAll(Collection c) { + public boolean retainAll(Collection c) { // Have to do this the slow way to ensure correct comparisons. i.e. // cannot delegate to c.contains(it) since we can't be sure will // compare elements the way we want. boolean changed = false; Object[] retainAll = c.toArray(); - outer: for (Iterator iterator = iterator(); iterator.hasNext();) { - Object element = iterator.next(); + outer: for (Iterator iterator = iterator(); iterator.hasNext();) { + E element = iterator.next(); for (int i = 0; i < retainAll.length; i++) { if (element == retainAll[i]) { continue outer; @@ -153,18 +160,19 @@ public class IdentitySet implements Set return toArray(new Object[wrappedSet.size()]); } + @SuppressWarnings("unchecked") @Override - public Object[] toArray(Object[] a) { + public T[] toArray(T[] a) { int size = wrappedSet.size(); - IdentityWrapper[] wrappedArray = (IdentityWrapper[]) wrappedSet - .toArray(new IdentityWrapper[size]); - Object[] result = a; + T[] result = a; if (a.length < size) { - result = (Object[]) Array.newInstance(a.getClass() - .getComponentType(), size); + result = (T[]) Array.newInstance(a.getClass().getComponentType(), size); + } + + int i = 0; + for (IdentityWrapper wrapper : wrappedSet) { + result[i++] = (T) wrapper.unwrap(); } - for (int i = 0; i < size; i++) - result[i] = wrappedArray[i].unwrap(); return result; } @@ -174,15 +182,14 @@ public class IdentitySet implements Set return true; if (!(obj instanceof Set)) return false; - Set that = (Set) obj; + Set that = (Set) obj; return size() == that.size() && containsAll(that); } @Override public int hashCode() { int hash = 0; - for (Iterator iterator = iterator(); iterator.hasNext();) { - Object element = iterator.next(); + for (E element : this) { hash += element == null ? 0 : element.hashCode(); } return hash; diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/IdentityWrapper.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/IdentityWrapper.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/IdentityWrapper.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/IdentityWrapper.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,14 +1,18 @@ /******************************************************************************* * Copyright (c) 2006, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation * Daniel Kruegler - bug 137435 * Matthew Hall - bug 303847 + * Stefan Xenos - Bug 335792 ******************************************************************************/ package org.eclipse.core.internal.databinding; @@ -18,36 +22,40 @@ package org.eclipse.core.internal.databi * and hashCode() when putting them in sets or hashmaps to ensure identity * comparison. * + * @param + * the type of the object being wrapped * @since 1.0 * */ -public class IdentityWrapper { +public class IdentityWrapper { - private static final IdentityWrapper NULL_WRAPPER = new IdentityWrapper( - null); + @SuppressWarnings("rawtypes") + private static final IdentityWrapper NULL_WRAPPER = new IdentityWrapper<>(null); /** - * @param obj + * @param + * the type of the object being wrapped + * @param o * the object to wrap * @return an IdentityWrapper wrapping the specified object */ - public static IdentityWrapper wrap(Object obj) { - return obj == null ? NULL_WRAPPER : new IdentityWrapper(obj); + public static IdentityWrapper wrap(T o) { + return o == null ? NULL_WRAPPER : new IdentityWrapper<>(o); } - final Object o; + final T o; /** * @param o */ - private IdentityWrapper(Object o) { + private IdentityWrapper(T o) { this.o = o; } /** * @return the unwrapped object */ - public Object unwrap() { + public T unwrap() { return o; } @@ -56,7 +64,7 @@ public class IdentityWrapper { if (obj == null || obj.getClass() != IdentityWrapper.class) { return false; } - return o == ((IdentityWrapper) obj).o; + return o == ((IdentityWrapper) obj).o; } @Override diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/messages.properties 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/messages.properties --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/messages.properties 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/messages.properties 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2000, 2008 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 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/Pair.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/Pair.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/Pair.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/Pair.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/Queue.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/Queue.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/Queue.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/Queue.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/Util.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/Util.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/Util.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/Util.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/AbstractStringToNumberValidator.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/AbstractStringToNumberValidator.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/AbstractStringToNumberValidator.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/AbstractStringToNumberValidator.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation @@ -24,8 +27,8 @@ import org.eclipse.core.runtime.Status; * * @since 1.0 */ -public abstract class AbstractStringToNumberValidator implements IValidator { - private final NumberFormatConverter converter; +public abstract class AbstractStringToNumberValidator implements IValidator { + private final NumberFormatConverter converter; private final boolean toPrimitive; private final Number min; @@ -40,14 +43,13 @@ public abstract class AbstractStringToNu * @param min minimum value, used for reporting a range error to the user * @param max maximum value, used for reporting a range error to the user */ - protected AbstractStringToNumberValidator(NumberFormatConverter converter, - Number min, Number max) { + protected AbstractStringToNumberValidator(NumberFormatConverter converter, Number min, Number max) { this.converter = converter; this.min = min; this.max = max; if (converter.getToType() instanceof Class) { - Class clazz = (Class) converter.getToType(); + Class clazz = (Class) converter.getToType(); toPrimitive = clazz.isPrimitive(); } else { toPrimitive = false; diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/NumberFormatConverter.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/NumberFormatConverter.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/NumberFormatConverter.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/NumberFormatConverter.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation @@ -18,9 +21,14 @@ import com.ibm.icu.text.NumberFormat; /** * Converter that uses a number format for conversion. * + * @param + * The type from which values are converted. + * @param + * The type to which values are converted. + * * @since 1.0 */ -public abstract class NumberFormatConverter extends Converter { +public abstract class NumberFormatConverter extends Converter { private final NumberFormat numberFormat; /** diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/NumberToByteValidator.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/NumberToByteValidator.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/NumberToByteValidator.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/NumberToByteValidator.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/NumberToDoubleValidator.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/NumberToDoubleValidator.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/NumberToDoubleValidator.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/NumberToDoubleValidator.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007, 2018 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/NumberToFloatValidator.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/NumberToFloatValidator.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/NumberToFloatValidator.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/NumberToFloatValidator.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007, 2018 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/NumberToIntegerValidator.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/NumberToIntegerValidator.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/NumberToIntegerValidator.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/NumberToIntegerValidator.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/NumberToLongValidator.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/NumberToLongValidator.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/NumberToLongValidator.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/NumberToLongValidator.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007, 2018 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/NumberToNumberValidator.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/NumberToNumberValidator.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/NumberToNumberValidator.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/NumberToNumberValidator.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation @@ -26,8 +29,8 @@ import org.eclipse.core.runtime.Status; * * @since 1.0 */ -public abstract class NumberToNumberValidator implements IValidator { - private final NumberToNumberConverter converter; +public abstract class NumberToNumberValidator implements IValidator { + private final NumberToNumberConverter converter; private final Number min; @@ -44,13 +47,13 @@ public abstract class NumberToNumberVali * @param max * can be null */ - protected NumberToNumberValidator(NumberToNumberConverter converter, + protected NumberToNumberValidator(NumberToNumberConverter converter, Number min, Number max) { this.converter = converter; this.min = min; this.max = max; - primitive = ((Class) converter.getToType()).isPrimitive(); + primitive = ((Class) converter.getToType()).isPrimitive(); } @Override diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/NumberToShortValidator.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/NumberToShortValidator.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/NumberToShortValidator.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/NumberToShortValidator.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007, 2018 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/NumberToUnboundedNumberValidator.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/NumberToUnboundedNumberValidator.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/NumberToUnboundedNumberValidator.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/NumberToUnboundedNumberValidator.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation @@ -25,7 +28,7 @@ public class NumberToUnboundedNumberVali /** * @param converter */ - public NumberToUnboundedNumberValidator(NumberToNumberConverter converter) { + public NumberToUnboundedNumberValidator(NumberToNumberConverter converter) { super(converter, null, null); } diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/ObjectToPrimitiveValidator.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/ObjectToPrimitiveValidator.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/ObjectToPrimitiveValidator.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/ObjectToPrimitiveValidator.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2014 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation @@ -22,11 +25,11 @@ import org.eclipse.core.runtime.Status; * @since 3.2 * */ -public class ObjectToPrimitiveValidator implements IValidator { +public class ObjectToPrimitiveValidator implements IValidator { - private Class toType; + private Class toType; - private Class[][] primitiveMap = new Class[][] { + private Class[][] primitiveMap = new Class[][] { { Integer.TYPE, Integer.class }, { Short.TYPE, Short.class }, { Long.TYPE, Long.class }, { Double.TYPE, Double.class }, { Byte.TYPE, Byte.class }, { Float.TYPE, Float.class }, @@ -36,11 +39,11 @@ public class ObjectToPrimitiveValidator /** * @param toType */ - public ObjectToPrimitiveValidator(Class toType) { + public ObjectToPrimitiveValidator(Class toType) { this.toType = toType; } - protected Class getToType() { + protected Class getToType() { return this.toType; } @@ -59,8 +62,8 @@ public class ObjectToPrimitiveValidator return ValidationStatus.error(getNullHint()); } - private boolean mapContainsValues(Class toType, Class fromType) { - for (Class[] primitiveTuple : primitiveMap) { + private boolean mapContainsValues(Class toType, Class fromType) { + for (Class[] primitiveTuple : primitiveMap) { if ((primitiveTuple[0].equals(toType)) && (primitiveTuple[1].equals(fromType))) { return true; diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/ReadOnlyValidator.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/ReadOnlyValidator.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/ReadOnlyValidator.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/ReadOnlyValidator.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,10 +1,13 @@ /* * Copyright (C) 2005, 2014 db4objects Inc. (http://www.db4o.com) and others. * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * db4objects - Initial API and implementation @@ -21,7 +24,7 @@ import org.eclipse.core.runtime.IStatus; /** * ReadOnlyValidator. A validator that can be used as a partial validator for read-only fields. */ -public class ReadOnlyValidator implements IValidator { +public class ReadOnlyValidator implements IValidator { private static ReadOnlyValidator singleton = null; diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/StringToByteValidator.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/StringToByteValidator.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/StringToByteValidator.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/StringToByteValidator.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation @@ -20,7 +23,7 @@ public class StringToByteValidator exten /** * @param converter */ - public StringToByteValidator(NumberFormatConverter converter) { + public StringToByteValidator(NumberFormatConverter converter) { super(converter, Byte.MIN_VALUE, Byte.MAX_VALUE); } diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/StringToCharacterValidator.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/StringToCharacterValidator.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/StringToCharacterValidator.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/StringToCharacterValidator.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007, 2014 Matt Carter and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matt Carter - initial API and implementation @@ -22,7 +25,7 @@ import org.eclipse.core.runtime.Status; /** * Validates a String to Character conversion. */ -public class StringToCharacterValidator implements IValidator { +public class StringToCharacterValidator implements IValidator { private final StringToCharacterConverter converter; diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/StringToDateValidator.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/StringToDateValidator.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/StringToDateValidator.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/StringToDateValidator.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007, 2014 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation @@ -25,7 +28,7 @@ import org.eclipse.core.runtime.Status; /** * @since 1.0 */ -public class StringToDateValidator implements IValidator { +public class StringToDateValidator implements IValidator { private final StringToDateConverter converter; /** @@ -36,12 +39,12 @@ public class StringToDateValidator imple } @Override - public IStatus validate(Object value) { - if (value instanceof String && ((String)value).trim().length()==0) { + public IStatus validate(String value) { + if (value.trim().length() == 0) { return Status.OK_STATUS; } - Object convertedValue = converter.convert(value); - //The StringToDateConverter returns null if it can't parse the date. + Date convertedValue = converter.convert(value); + // The StringToDateConverter returns null if it can't parse the date. if (convertedValue == null) { return ValidationStatus.error(getErrorMessage()); } @@ -64,11 +67,11 @@ public class StringToDateValidator imple samples.append('\''); samples.append(util.format(sampleDate, 0)); samples.append('\''); - return BindingMessages.getString(BindingMessages.EXAMPLES) + ": " + samples + ",..."; //$NON-NLS-1$//$NON-NLS-2$ + return BindingMessages.getString(BindingMessages.EXAMPLES) + + ": " + samples + ",..."; //$NON-NLS-1$//$NON-NLS-2$ } private static class FormatUtil extends DateConversionSupport { - @Override protected int numFormatters() { return super.numFormatters(); diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/StringToDoubleValidator.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/StringToDoubleValidator.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/StringToDoubleValidator.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/StringToDoubleValidator.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007, 2018 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation @@ -23,7 +26,7 @@ public class StringToDoubleValidator ext /** * @param converter */ - public StringToDoubleValidator(NumberFormatConverter converter) { + public StringToDoubleValidator(NumberFormatConverter converter) { super(converter, MIN, MAX); } diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/StringToFloatValidator.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/StringToFloatValidator.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/StringToFloatValidator.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/StringToFloatValidator.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007, 2018 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation @@ -27,7 +30,7 @@ public class StringToFloatValidator exte /** * @param converter */ - public StringToFloatValidator(NumberFormatConverter converter) { + public StringToFloatValidator(NumberFormatConverter converter) { super(converter, MIN, MAX); } diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/StringToIntegerValidator.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/StringToIntegerValidator.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/StringToIntegerValidator.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/StringToIntegerValidator.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation @@ -27,7 +30,7 @@ public class StringToIntegerValidator ex /** * @param converter */ - public StringToIntegerValidator(NumberFormatConverter converter) { + public StringToIntegerValidator(NumberFormatConverter converter) { super(converter, MIN, MAX); } diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/StringToLongValidator.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/StringToLongValidator.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/StringToLongValidator.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/StringToLongValidator.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007, 2018 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation @@ -26,7 +29,7 @@ public class StringToLongValidator exten /** * @param converter */ - public StringToLongValidator(NumberFormatConverter converter) { + public StringToLongValidator(NumberFormatConverter converter) { super(converter, MIN, MAX); } diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/StringToShortValidator.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/StringToShortValidator.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/StringToShortValidator.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/StringToShortValidator.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007, 2018 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation @@ -23,7 +26,7 @@ public class StringToShortValidator exte /** * @param converter */ - public StringToShortValidator(NumberFormatConverter converter) { + public StringToShortValidator(NumberFormatConverter converter) { super(converter, MIN, MAX); } diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/ValidatedObservableList.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/ValidatedObservableList.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/ValidatedObservableList.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/ValidatedObservableList.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2017 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 218269) @@ -33,39 +36,41 @@ import org.eclipse.core.runtime.Assert; import org.eclipse.core.runtime.IStatus; /** + * @param + * The element type of the list. * @since 3.3 * */ -public class ValidatedObservableList extends ObservableList { - private IObservableList target; - private IObservableValue validationStatus; +public class ValidatedObservableList extends ObservableList { + private IObservableList target; + private IObservableValue validationStatus; // Only true when out of sync with target due to validation status private boolean stale; - // True when validaton status changes from invalid to valid. + // True when validation status changes from invalid to valid. private boolean computeNextDiff = false; private boolean updatingTarget = false; - private IListChangeListener targetChangeListener = event -> { + private IListChangeListener targetChangeListener = event -> { if (updatingTarget) return; - IStatus status = (IStatus) validationStatus.getValue(); + IStatus status = validationStatus.getValue(); if (isValid(status)) { if (stale) { // this.stale means we are out of sync with target, // so reset wrapped list to exactly mirror target stale = false; - updateWrappedList(new ArrayList(target)); + updateWrappedList(new ArrayList<>(target)); } else { - ListDiff diff = event.diff; + ListDiff diff = event.diff; if (computeNextDiff) { diff = Diffs.computeListDiff(wrappedList, target); computeNextDiff = false; } applyDiff(diff, wrappedList); - fireListChange(diff); + fireListChange(Diffs.unmodifiableDiff(diff)); } } else { makeStale(); @@ -78,14 +83,14 @@ public class ValidatedObservableList ext private IStaleListener targetStaleListener = staleEvent -> fireStale(); - private IValueChangeListener validationStatusChangeListener = event -> { - IStatus oldStatus = (IStatus) event.diff.getOldValue(); - IStatus newStatus = (IStatus) event.diff.getNewValue(); + private IValueChangeListener validationStatusChangeListener = event -> { + IStatus oldStatus = event.diff.getOldValue(); + IStatus newStatus = event.diff.getNewValue(); if (stale && !isValid(oldStatus) && isValid(newStatus)) { // this.stale means we are out of sync with target, // reset wrapped list to exactly mirror target stale = false; - updateWrappedList(new ArrayList(target)); + updateWrappedList(new ArrayList<>(target)); // If the validation status becomes valid because of a change in // target observable @@ -97,14 +102,12 @@ public class ValidatedObservableList ext * @param target * @param validationStatus */ - public ValidatedObservableList(final IObservableList target, - final IObservableValue validationStatus) { - super(target.getRealm(), new ArrayList(target), target.getElementType()); + public ValidatedObservableList(final IObservableList target, final IObservableValue validationStatus) { + super(target.getRealm(), new ArrayList<>(target), target.getElementType()); Assert.isNotNull(validationStatus, "Validation status observable cannot be null"); //$NON-NLS-1$ - Assert - .isTrue(target.getRealm().equals(validationStatus.getRealm()), - "Target and validation status observables must be on the same realm"); //$NON-NLS-1$ + Assert.isTrue(target.getRealm().equals(validationStatus.getRealm()), + "Target and validation status observables must be on the same realm"); //$NON-NLS-1$ this.target = target; this.validationStatus = validationStatus; target.addListChangeListener(targetChangeListener); @@ -119,7 +122,7 @@ public class ValidatedObservableList ext } } - private void updateTargetList(ListDiff diff) { + private void updateTargetList(ListDiff diff) { updatingTarget = true; try { if (stale) { @@ -133,21 +136,20 @@ public class ValidatedObservableList ext } } - private void applyDiff(ListDiff diff, final List list) { - diff.accept(new ListDiffVisitor() { + private void applyDiff(ListDiff diff, final List list) { + diff.accept(new ListDiffVisitor() { @Override - public void handleAdd(int index, Object element) { + public void handleAdd(int index, E element) { list.add(index, element); } @Override - public void handleRemove(int index, Object element) { + public void handleRemove(int index, E element) { list.remove(index); } @Override - public void handleReplace(int index, Object oldElement, - Object newElement) { + public void handleReplace(int index, E oldElement, E newElement) { list.set(index, newElement); } }); @@ -160,39 +162,38 @@ public class ValidatedObservableList ext } @Override - public void add(int index, Object element) { + public void add(int index, E element) { checkRealm(); wrappedList.add(index, element); - ListDiff diff = Diffs.createListDiff(Diffs.createListDiffEntry(index, - true, element)); + ListDiff diff = Diffs.createListDiff(Diffs.createListDiffEntry(index, true, element)); updateTargetList(diff); fireListChange(diff); } @Override - public boolean add(Object o) { + public boolean add(E o) { checkRealm(); add(wrappedList.size(), o); return true; } @Override - public boolean addAll(Collection c) { + public boolean addAll(Collection c) { checkRealm(); return addAll(wrappedList.size(), c); } @Override - public boolean addAll(int index, Collection c) { + public boolean addAll(int index, Collection c) { checkRealm(); - Object[] elements = c.toArray(); - ListDiffEntry[] entries = new ListDiffEntry[elements.length]; - for (int i = 0; i < elements.length; i++) { - wrappedList.add(index + i, elements[i]); - entries[i] = Diffs - .createListDiffEntry(index + i, true, elements[i]); + List> entries = new ArrayList<>(c.size()); + int i = index; + for (E element : c) { + wrappedList.add(i, element); + entries.add(Diffs.createListDiffEntry(i, true, element)); + i++; } - ListDiff diff = Diffs.createListDiff(entries); + ListDiff diff = Diffs.createListDiff(entries); updateTargetList(diff); fireListChange(diff); return true; @@ -203,19 +204,18 @@ public class ValidatedObservableList ext checkRealm(); if (isEmpty()) return; - ListDiff diff = Diffs.computeListDiff(wrappedList, - Collections.EMPTY_LIST); + ListDiff diff = Diffs.computeListDiff(wrappedList, Collections.emptyList()); wrappedList.clear(); updateTargetList(diff); fireListChange(diff); } @Override - public Iterator iterator() { + public Iterator iterator() { getterCalled(); - final ListIterator wrappedIterator = wrappedList.listIterator(); - return new Iterator() { - Object last = null; + final ListIterator wrappedIterator = wrappedList.listIterator(); + return new Iterator() { + E last = null; @Override public boolean hasNext() { @@ -223,7 +223,7 @@ public class ValidatedObservableList ext } @Override - public Object next() { + public E next() { return last = wrappedIterator.next(); } @@ -231,8 +231,7 @@ public class ValidatedObservableList ext public void remove() { int index = wrappedIterator.previousIndex(); wrappedIterator.remove(); - ListDiff diff = Diffs.createListDiff(Diffs.createListDiffEntry( - index, false, last)); + ListDiff diff = Diffs.createListDiff(Diffs.createListDiffEntry(index, false, last)); updateTargetList(diff); fireListChange(diff); } @@ -240,24 +239,23 @@ public class ValidatedObservableList ext } @Override - public ListIterator listIterator() { + public ListIterator listIterator() { return listIterator(0); } @Override - public ListIterator listIterator(int index) { + public ListIterator listIterator(int index) { getterCalled(); - final ListIterator wrappedIterator = wrappedList.listIterator(index); - return new ListIterator() { + final ListIterator wrappedIterator = wrappedList.listIterator(index); + return new ListIterator() { int lastIndex = -1; - Object last = null; + E last = null; @Override - public void add(Object o) { + public void add(E o) { wrappedIterator.add(o); lastIndex = previousIndex(); - ListDiff diff = Diffs.createListDiff(Diffs.createListDiffEntry( - lastIndex, true, o)); + ListDiff diff = Diffs.createListDiff(Diffs.createListDiffEntry(lastIndex, true, o)); updateTargetList(diff); fireListChange(diff); } @@ -273,7 +271,7 @@ public class ValidatedObservableList ext } @Override - public Object next() { + public E next() { last = wrappedIterator.next(); lastIndex = previousIndex(); return last; @@ -285,7 +283,7 @@ public class ValidatedObservableList ext } @Override - public Object previous() { + public E previous() { last = wrappedIterator.previous(); lastIndex = nextIndex(); return last; @@ -299,19 +297,18 @@ public class ValidatedObservableList ext @Override public void remove() { wrappedIterator.remove(); - ListDiff diff = Diffs.createListDiff(Diffs.createListDiffEntry( - lastIndex, false, last)); + ListDiff diff = Diffs.createListDiff(Diffs.createListDiffEntry(lastIndex, false, last)); lastIndex = -1; updateTargetList(diff); fireListChange(diff); } @Override - public void set(Object o) { + public void set(E o) { wrappedIterator.set(o); - ListDiff diff = Diffs.createListDiff(Diffs.createListDiffEntry( - lastIndex, false, last), Diffs.createListDiffEntry( - lastIndex, true, o)); + ListDiff diff = Diffs.createListDiff( + Diffs.createListDiffEntry(lastIndex, false, last), + Diffs.createListDiffEntry(lastIndex, true, o)); last = o; updateTargetList(diff); fireListChange(diff); @@ -320,7 +317,7 @@ public class ValidatedObservableList ext } @Override - public Object move(int oldIndex, int newIndex) { + public E move(int oldIndex, int newIndex) { checkRealm(); int size = wrappedList.size(); if (oldIndex >= size) @@ -331,22 +328,22 @@ public class ValidatedObservableList ext "newIndex: " + newIndex + ", size:" + size); //$NON-NLS-1$ //$NON-NLS-2$ if (oldIndex == newIndex) return wrappedList.get(oldIndex); - Object element = wrappedList.remove(oldIndex); + E element = wrappedList.remove(oldIndex); wrappedList.add(newIndex, element); - ListDiff diff = Diffs.createListDiff(Diffs.createListDiffEntry( - oldIndex, false, element), Diffs.createListDiffEntry(newIndex, - true, element)); + ListDiff diff = Diffs.createListDiff( + Diffs.createListDiffEntry(oldIndex, false, element), + Diffs.createListDiffEntry(newIndex, true, element)); updateTargetList(diff); fireListChange(diff); return element; } @Override - public Object remove(int index) { + public E remove(int index) { checkRealm(); - Object element = wrappedList.remove(index); - ListDiff diff = Diffs.createListDiff(Diffs.createListDiffEntry(index, - false, element)); + E element = wrappedList.remove(index); + ListDiff diff = Diffs.createListDiff(Diffs.createListDiffEntry( + index, false, element)); updateTargetList(diff); fireListChange(diff); return element; @@ -363,12 +360,12 @@ public class ValidatedObservableList ext } @Override - public boolean removeAll(Collection c) { + public boolean removeAll(Collection c) { checkRealm(); - List list = new ArrayList(wrappedList); + List list = new ArrayList<>(wrappedList); boolean changed = list.removeAll(c); if (changed) { - ListDiff diff = Diffs.computeListDiff(wrappedList, list); + ListDiff diff = Diffs.computeListDiff(wrappedList, list); wrappedList = list; updateTargetList(diff); fireListChange(diff); @@ -377,12 +374,12 @@ public class ValidatedObservableList ext } @Override - public boolean retainAll(Collection c) { + public boolean retainAll(Collection c) { checkRealm(); - List list = new ArrayList(wrappedList); + List list = new ArrayList<>(wrappedList); boolean changed = list.retainAll(c); if (changed) { - ListDiff diff = Diffs.computeListDiff(wrappedList, list); + ListDiff diff = Diffs.computeListDiff(wrappedList, list); wrappedList = list; updateTargetList(diff); fireListChange(diff); @@ -391,12 +388,12 @@ public class ValidatedObservableList ext } @Override - public Object set(int index, Object element) { + public E set(int index, E element) { checkRealm(); - Object oldElement = wrappedList.set(index, element); - ListDiff diff = Diffs.createListDiff(Diffs.createListDiffEntry(index, - false, oldElement), Diffs.createListDiffEntry(index, true, - element)); + E oldElement = wrappedList.set(index, element); + ListDiff diff = Diffs.createListDiff( + Diffs.createListDiffEntry(index, false, oldElement), + Diffs.createListDiffEntry(index, true, element)); updateTargetList(diff); fireListChange(diff); return oldElement; diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/ValidatedObservableMap.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/ValidatedObservableMap.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/ValidatedObservableMap.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/ValidatedObservableMap.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2017 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 218269) @@ -29,12 +32,16 @@ import org.eclipse.core.runtime.Assert; import org.eclipse.core.runtime.IStatus; /** + * @param + * The key type. + * @param + * The value type. * @since 3.3 * */ -public class ValidatedObservableMap extends ObservableMap { - private IObservableMap target; - private IObservableValue validationStatus; +public class ValidatedObservableMap extends ObservableMap { + private IObservableMap target; + private IObservableValue validationStatus; // Only true when out of sync with target due to validation status private boolean stale; @@ -44,24 +51,24 @@ public class ValidatedObservableMap exte private boolean updatingTarget = false; - private IMapChangeListener targetChangeListener = event -> { + private IMapChangeListener targetChangeListener = event -> { if (updatingTarget) return; - IStatus status = (IStatus) validationStatus.getValue(); + IStatus status = validationStatus.getValue(); if (isValid(status)) { if (stale) { // this.stale means we are out of sync with target, // so reset wrapped list to exactly mirror target stale = false; - updateWrappedMap(new HashMap(target)); + updateWrappedMap(new HashMap<>(target)); } else { - MapDiff diff = event.diff; + MapDiff diff = event.diff; if (computeNextDiff) { diff = Diffs.computeMapDiff(wrappedMap, target); computeNextDiff = false; } applyDiff(diff, wrappedMap); - fireMapChange(diff); + fireMapChange(Diffs.unmodifiableDiff(diff)); } } else { makeStale(); @@ -70,14 +77,14 @@ public class ValidatedObservableMap exte private IStaleListener targetStaleListener = staleEvent -> fireStale(); - private IValueChangeListener validationStatusChangeListener = event -> { - IStatus oldStatus = (IStatus) event.diff.getOldValue(); - IStatus newStatus = (IStatus) event.diff.getNewValue(); + private IValueChangeListener validationStatusChangeListener = event -> { + IStatus oldStatus = event.diff.getOldValue(); + IStatus newStatus = event.diff.getNewValue(); if (stale && !isValid(oldStatus) && isValid(newStatus)) { // this.stale means we are out of sync with target, // reset wrapped map to exactly mirror target stale = false; - updateWrappedMap(new HashMap(target)); + updateWrappedMap(new HashMap<>(target)); // If the validation status becomes valid because of a change in // target observable @@ -89,14 +96,12 @@ public class ValidatedObservableMap exte * @param target * @param validationStatus */ - public ValidatedObservableMap(final IObservableMap target, - final IObservableValue validationStatus) { - super(target.getRealm(), new HashMap(target)); + public ValidatedObservableMap(final IObservableMap target, final IObservableValue validationStatus) { + super(target.getRealm(), new HashMap(target)); Assert.isNotNull(validationStatus, "Validation status observable cannot be null"); //$NON-NLS-1$ - Assert - .isTrue(target.getRealm().equals(validationStatus.getRealm()), - "Target and validation status observables must be on the same realm"); //$NON-NLS-1$ + Assert.isTrue(target.getRealm().equals(validationStatus.getRealm()), + "Target and validation status observables must be on the same realm"); //$NON-NLS-1$ this.target = target; this.validationStatus = validationStatus; target.addMapChangeListener(targetChangeListener); @@ -104,9 +109,9 @@ public class ValidatedObservableMap exte validationStatus.addValueChangeListener(validationStatusChangeListener); } - private void updateWrappedMap(Map newMap) { - Map oldMap = wrappedMap; - MapDiff diff = Diffs.computeMapDiff(oldMap, newMap); + private void updateWrappedMap(Map newMap) { + Map oldMap = wrappedMap; + MapDiff diff = Diffs.computeMapDiff(oldMap, newMap); wrappedMap = newMap; fireMapChange(diff); } @@ -115,18 +120,15 @@ public class ValidatedObservableMap exte return status.isOK() || status.matches(IStatus.INFO | IStatus.WARNING); } - private void applyDiff(MapDiff diff, Map map) { - for (Iterator iterator = diff.getRemovedKeys().iterator(); iterator - .hasNext();) + private void applyDiff(MapDiff diff, Map map) { + for (Iterator iterator = diff.getRemovedKeys().iterator(); iterator.hasNext();) map.remove(iterator.next()); - for (Iterator iterator = diff.getChangedKeys().iterator(); iterator - .hasNext();) { - Object key = iterator.next(); + for (Iterator iterator = diff.getChangedKeys().iterator(); iterator.hasNext();) { + K key = iterator.next(); map.put(key, diff.getNewValue(key)); } - for (Iterator iterator = diff.getAddedKeys().iterator(); iterator - .hasNext();) { - Object key = iterator.next(); + for (Iterator iterator = diff.getAddedKeys().iterator(); iterator.hasNext();) { + K key = iterator.next(); map.put(key, diff.getNewValue(key)); } } @@ -138,7 +140,7 @@ public class ValidatedObservableMap exte } } - private void updateTargetMap(MapDiff diff) { + private void updateTargetMap(MapDiff diff) { updatingTarget = true; try { if (stale) { @@ -163,17 +165,17 @@ public class ValidatedObservableMap exte checkRealm(); if (isEmpty()) return; - MapDiff diff = Diffs.computeMapDiff(wrappedMap, Collections.EMPTY_MAP); - wrappedMap = new HashMap(); + MapDiff diff = Diffs.computeMapDiff(wrappedMap, Collections.emptyMap()); + wrappedMap = new HashMap<>(); updateTargetMap(diff); fireMapChange(diff); } @Override - public Object put(Object key, Object value) { + public V put(K key, V value) { checkRealm(); - MapDiff diff; - Object oldValue; + MapDiff diff; + V oldValue; if (wrappedMap.containsKey(key)) { oldValue = wrappedMap.put(key, value); if (wrappedMap.containsKey(key)) { // Changed @@ -191,23 +193,25 @@ public class ValidatedObservableMap exte } @Override - public void putAll(Map m) { + public void putAll(Map m) { checkRealm(); - Map map = new HashMap(wrappedMap); + Map map = new HashMap<>(wrappedMap); map.putAll(m); - MapDiff diff = Diffs.computeMapDiff(wrappedMap, map); + MapDiff diff = Diffs.computeMapDiff(wrappedMap, map); wrappedMap = map; updateTargetMap(diff); fireMapChange(diff); } @Override - public Object remove(Object key) { + public V remove(Object key) { checkRealm(); if (!wrappedMap.containsKey(key)) return null; - Object oldValue = wrappedMap.remove(key); - MapDiff diff = Diffs.createMapDiffSingleRemove(key, oldValue); + + V oldValue = wrappedMap.remove(key); + @SuppressWarnings("unchecked") + MapDiff diff = Diffs.createMapDiffSingleRemove((K) key, oldValue); updateTargetMap(diff); fireMapChange(diff); return oldValue; @@ -227,8 +231,7 @@ public class ValidatedObservableMap exte public synchronized void dispose() { target.removeMapChangeListener(targetChangeListener); target.removeStaleListener(targetStaleListener); - validationStatus - .removeValueChangeListener(validationStatusChangeListener); + validationStatus.removeValueChangeListener(validationStatusChangeListener); super.dispose(); } } diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/ValidatedObservableSet.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/ValidatedObservableSet.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/ValidatedObservableSet.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/ValidatedObservableSet.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2017 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 218269) @@ -29,12 +32,14 @@ import org.eclipse.core.runtime.Assert; import org.eclipse.core.runtime.IStatus; /** + * @param + * The element type. * @since 3.3 * */ -public class ValidatedObservableSet extends ObservableSet { - private IObservableSet target; - private IObservableValue validationStatus; +public class ValidatedObservableSet extends ObservableSet { + private IObservableSet target; + private IObservableValue validationStatus; // Only true when out of sync with target due to validation status private boolean stale; @@ -44,24 +49,24 @@ public class ValidatedObservableSet exte private boolean updatingTarget = false; - private ISetChangeListener targetChangeListener = event -> { + private ISetChangeListener targetChangeListener = event -> { if (updatingTarget) return; - IStatus status = (IStatus) validationStatus.getValue(); + IStatus status = validationStatus.getValue(); if (isValid(status)) { if (stale) { // this.stale means we are out of sync with target, // so reset wrapped list to exactly mirror target stale = false; - updateWrappedSet(new HashSet(target)); + updateWrappedSet(new HashSet<>(target)); } else { - SetDiff diff = event.diff; + SetDiff diff = event.diff; if (computeNextDiff) { diff = Diffs.computeSetDiff(wrappedSet, target); computeNextDiff = false; } applyDiff(diff, wrappedSet); - fireSetChange(diff); + fireSetChange(Diffs.unmodifiableDiff(diff)); } } else { makeStale(); @@ -70,15 +75,14 @@ public class ValidatedObservableSet exte private IStaleListener targetStaleListener = staleEvent -> fireStale(); - private IValueChangeListener validationStatusChangeListener = event -> { - IStatus oldStatus = (IStatus) event.diff.getOldValue(); - IStatus newStatus = (IStatus) event.diff.getNewValue(); + private IValueChangeListener validationStatusChangeListener = event -> { + IStatus oldStatus = event.diff.getOldValue(); + IStatus newStatus = event.diff.getNewValue(); if (stale && !isValid(oldStatus) && isValid(newStatus)) { // this.stale means we are out of sync with target, // reset wrapped set to exactly mirror target stale = false; - updateWrappedSet(new HashSet(target)); - + updateWrappedSet(new HashSet<>(target)); // If the validation status becomes valid because of a change in // target observable computeNextDiff = true; @@ -89,14 +93,14 @@ public class ValidatedObservableSet exte * @param target * @param validationStatus */ - public ValidatedObservableSet(final IObservableSet target, - final IObservableValue validationStatus) { - super(target.getRealm(), new HashSet(target), target.getElementType()); + public ValidatedObservableSet(final IObservableSet target, + final IObservableValue validationStatus) { + super(target.getRealm(), new HashSet<>(target), target + .getElementType()); Assert.isNotNull(validationStatus, "Validation status observable cannot be null"); //$NON-NLS-1$ - Assert - .isTrue(target.getRealm().equals(validationStatus.getRealm()), - "Target and validation status observables must be on the same realm"); //$NON-NLS-1$ + Assert.isTrue(target.getRealm().equals(validationStatus.getRealm()), + "Target and validation status observables must be on the same realm"); //$NON-NLS-1$ this.target = target; this.validationStatus = validationStatus; target.addSetChangeListener(targetChangeListener); @@ -104,9 +108,9 @@ public class ValidatedObservableSet exte validationStatus.addValueChangeListener(validationStatusChangeListener); } - private void updateWrappedSet(Set newSet) { - Set oldSet = wrappedSet; - SetDiff diff = Diffs.computeSetDiff(oldSet, newSet); + private void updateWrappedSet(Set newSet) { + Set oldSet = wrappedSet; + SetDiff diff = Diffs.computeSetDiff(oldSet, newSet); wrappedSet = newSet; fireSetChange(diff); } @@ -115,12 +119,12 @@ public class ValidatedObservableSet exte return status.isOK() || status.matches(IStatus.INFO | IStatus.WARNING); } - private void applyDiff(SetDiff diff, Set set) { - for (Iterator iterator = diff.getRemovals().iterator(); iterator + private void applyDiff(SetDiff diff, Set set) { + for (Iterator iterator = diff.getRemovals().iterator(); iterator .hasNext();) { set.remove(iterator.next()); } - for (Iterator iterator = diff.getAdditions().iterator(); iterator + for (Iterator iterator = diff.getAdditions().iterator(); iterator .hasNext();) { set.add(iterator.next()); } @@ -133,7 +137,7 @@ public class ValidatedObservableSet exte } } - private void updateTargetSet(SetDiff diff) { + private void updateTargetSet(SetDiff diff) { updatingTarget = true; try { if (stale) { @@ -154,12 +158,12 @@ public class ValidatedObservableSet exte } @Override - public boolean add(Object o) { + public boolean add(E o) { getterCalled(); boolean changed = wrappedSet.add(o); if (changed) { - SetDiff diff = Diffs.createSetDiff(Collections.singleton(o), - Collections.EMPTY_SET); + SetDiff diff = Diffs.createSetDiff(Collections.singleton(o), + Collections. emptySet()); updateTargetSet(diff); fireSetChange(diff); } @@ -167,12 +171,12 @@ public class ValidatedObservableSet exte } @Override - public boolean addAll(Collection c) { + public boolean addAll(Collection c) { getterCalled(); - HashSet set = new HashSet(wrappedSet); + HashSet set = new HashSet(wrappedSet); boolean changed = set.addAll(c); if (changed) { - SetDiff diff = Diffs.computeSetDiff(wrappedSet, set); + SetDiff diff = Diffs.computeSetDiff(wrappedSet, set); wrappedSet = set; updateTargetSet(diff); fireSetChange(diff); @@ -185,18 +189,19 @@ public class ValidatedObservableSet exte getterCalled(); if (isEmpty()) return; - SetDiff diff = Diffs.createSetDiff(Collections.EMPTY_SET, wrappedSet); - wrappedSet = new HashSet(); + SetDiff diff = Diffs.createSetDiff(Collections. emptySet(), + wrappedSet); + wrappedSet = new HashSet(); updateTargetSet(diff); fireSetChange(diff); } @Override - public Iterator iterator() { + public Iterator iterator() { getterCalled(); - final Iterator wrappedIterator = wrappedSet.iterator(); - return new Iterator() { - Object last = null; + final Iterator wrappedIterator = wrappedSet.iterator(); + return new Iterator() { + E last = null; @Override public boolean hasNext() { @@ -204,15 +209,16 @@ public class ValidatedObservableSet exte } @Override - public Object next() { + public E next() { return last = wrappedIterator.next(); } @Override public void remove() { wrappedIterator.remove(); - SetDiff diff = Diffs.createSetDiff(Collections.EMPTY_SET, - Collections.singleton(last)); + SetDiff diff = Diffs + .createSetDiff(Collections. emptySet(), + Collections.singleton(last)); updateTargetSet(diff); fireSetChange(diff); } @@ -224,8 +230,9 @@ public class ValidatedObservableSet exte getterCalled(); boolean changed = wrappedSet.remove(o); if (changed) { - SetDiff diff = Diffs.createSetDiff(Collections.EMPTY_SET, - Collections.singleton(o)); + @SuppressWarnings("unchecked") + SetDiff diff = Diffs.createSetDiff(Collections.emptySet(), + Collections.singleton((E) o)); updateTargetSet(diff); fireSetChange(diff); } @@ -233,12 +240,12 @@ public class ValidatedObservableSet exte } @Override - public boolean removeAll(Collection c) { + public boolean removeAll(Collection c) { getterCalled(); - Set set = new HashSet(wrappedSet); + Set set = new HashSet(wrappedSet); boolean changed = set.removeAll(c); if (changed) { - SetDiff diff = Diffs.computeSetDiff(wrappedSet, set); + SetDiff diff = Diffs.computeSetDiff(wrappedSet, set); wrappedSet = set; updateTargetSet(diff); fireSetChange(diff); @@ -247,12 +254,12 @@ public class ValidatedObservableSet exte } @Override - public boolean retainAll(Collection c) { + public boolean retainAll(Collection c) { getterCalled(); - Set set = new HashSet(wrappedSet); + Set set = new HashSet(wrappedSet); boolean changed = set.retainAll(c); if (changed) { - SetDiff diff = Diffs.computeSetDiff(wrappedSet, set); + SetDiff diff = Diffs.computeSetDiff(wrappedSet, set); wrappedSet = set; updateTargetSet(diff); fireSetChange(diff); diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/ValidatedObservableValue.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/ValidatedObservableValue.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/ValidatedObservableValue.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/ValidatedObservableValue.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2017 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 218269) @@ -40,29 +43,32 @@ import org.eclipse.core.runtime.IStatus; *

    * Note: *

      - *
    • By default, a status is valid if its - * {@link IStatus#getSeverity() severity} is {@link IStatus#OK OK}, - * {@link IStatus#INFO INFO}, or {@link IStatus#WARNING WARNING} + *
    • By default, a status is valid if its {@link IStatus#getSeverity() + * severity} is {@link IStatus#OK OK}, {@link IStatus#INFO INFO}, or + * {@link IStatus#WARNING WARNING} *
    • Calls to {@link #setValue(Object)} on the validated observable changes * the value regardless of the validation status. *
    • This class will not forward {@link ValueChangingEvent} events from a * wrapped {@link IVetoableValue}. *
    * + * @param + * The type of the value. + * * @since 1.2 */ -public class ValidatedObservableValue extends AbstractObservableValue { - private IObservableValue target; - private IObservableValue validationStatus; +public class ValidatedObservableValue extends AbstractObservableValue { + private IObservableValue target; + private IObservableValue validationStatus; - private Object cachedValue; + private T cachedValue; private boolean stale; private boolean updatingTarget = false; - private IValueChangeListener targetChangeListener = event -> { + private IValueChangeListener targetChangeListener = event -> { if (updatingTarget) return; - IStatus status = (IStatus) validationStatus.getValue(); + IStatus status = validationStatus.getValue(); if (isValid(status)) internalSetValue(event.diff.getNewValue(), false); else @@ -75,9 +81,9 @@ public class ValidatedObservableValue ex private IStaleListener targetStaleListener = staleEvent -> fireStale(); - private IValueChangeListener validationStatusChangeListener = event -> { - IStatus oldStatus = (IStatus) event.diff.getOldValue(); - IStatus newStatus = (IStatus) event.diff.getNewValue(); + private IValueChangeListener validationStatusChangeListener = event -> { + IStatus oldStatus = event.diff.getOldValue(); + IStatus newStatus = event.diff.getNewValue(); if (stale && !isValid(oldStatus) && isValid(newStatus)) { internalSetValue(target.getValue(), false); } @@ -92,14 +98,12 @@ public class ValidatedObservableValue ex * an observable value of type {@link IStatus}.class which * contains the current validation status */ - public ValidatedObservableValue(IObservableValue target, - IObservableValue validationStatus) { + public ValidatedObservableValue(IObservableValue target, IObservableValue validationStatus) { super(target.getRealm()); Assert.isNotNull(validationStatus, "Validation status observable cannot be null"); //$NON-NLS-1$ - Assert - .isTrue(target.getRealm().equals(validationStatus.getRealm()), - "Target and validation status observables must be on the same realm"); //$NON-NLS-1$ + Assert.isTrue(target.getRealm().equals(validationStatus.getRealm()), + "Target and validation status observables must be on the same realm"); //$NON-NLS-1$ this.target = target; this.validationStatus = validationStatus; this.cachedValue = target.getValue(); @@ -123,12 +127,12 @@ public class ValidatedObservableValue ex } @Override - protected Object doGetValue() { + protected T doGetValue() { return cachedValue; } - private void internalSetValue(Object value, boolean updateTarget) { - Object oldValue = cachedValue; + private void internalSetValue(T value, boolean updateTarget) { + T oldValue = cachedValue; cachedValue = value; if (updateTarget) { updatingTarget = true; @@ -145,7 +149,7 @@ public class ValidatedObservableValue ex } @Override - protected void doSetValue(Object value) { + protected void doSetValue(T value) { internalSetValue(value, true); } diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/ValidationStatusMap.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/ValidationStatusMap.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/ValidationStatusMap.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/ValidationStatusMap.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2017 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation @@ -14,7 +17,6 @@ package org.eclipse.core.internal.databi import java.util.ArrayList; import java.util.HashMap; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; @@ -34,13 +36,13 @@ import org.eclipse.core.runtime.IStatus; * @since 1.0 * */ -public class ValidationStatusMap extends ObservableMap { +public class ValidationStatusMap extends ObservableMap { private boolean isDirty = true; - private final WritableList bindings; + private final WritableList bindings; - private List dependencies = new ArrayList(); + private List> dependencies = new ArrayList<>(); private IChangeListener markDirtyChangeListener = event -> markDirty(); @@ -48,8 +50,8 @@ public class ValidationStatusMap extends * @param realm * @param bindings */ - public ValidationStatusMap(Realm realm, WritableList bindings) { - super(realm, new HashMap()); + public ValidationStatusMap(Realm realm, WritableList bindings) { + super(realm, new HashMap<>()); this.bindings = bindings; bindings.addChangeListener(markDirtyChangeListener); } @@ -73,10 +75,10 @@ public class ValidationStatusMap extends private void markDirty() { // since we are dirty, we don't need to listen anymore removeElementChangeListener(); - final Map oldMap = wrappedMap; + final Map oldMap = wrappedMap; // lazy computation of diff - MapDiff mapDiff = new MapDiff() { - private MapDiff cachedDiff = null; + MapDiff mapDiff = new MapDiff() { + private MapDiff cachedDiff = null; private void ensureCached() { if (cachedDiff == null) { @@ -86,51 +88,48 @@ public class ValidationStatusMap extends } @Override - public Set getAddedKeys() { + public Set getAddedKeys() { ensureCached(); return cachedDiff.getAddedKeys(); } @Override - public Set getChangedKeys() { + public Set getChangedKeys() { ensureCached(); return cachedDiff.getChangedKeys(); } @Override - public Object getNewValue(Object key) { + public IStatus getNewValue(Object key) { ensureCached(); return cachedDiff.getNewValue(key); } @Override - public Object getOldValue(Object key) { + public IStatus getOldValue(Object key) { ensureCached(); return cachedDiff.getOldValue(key); } @Override - public Set getRemovedKeys() { + public Set getRemovedKeys() { ensureCached(); return cachedDiff.getRemovedKeys(); } }; - wrappedMap = new HashMap(); + wrappedMap = new HashMap<>(); isDirty = true; fireMapChange(mapDiff); } private void recompute() { if (isDirty) { - Map newContents = new HashMap(); - for (Iterator it = bindings.iterator(); it.hasNext();) { - Binding binding = (Binding) it.next(); - IObservableValue validationError = binding - .getValidationStatus(); + Map newContents = new HashMap<>(); + for (Binding binding : bindings) { + IObservableValue validationError = binding.getValidationStatus(); dependencies.add(validationError); validationError.addChangeListener(markDirtyChangeListener); - IStatus validationStatusValue = (IStatus) validationError - .getValue(); + IStatus validationStatusValue = validationError.getValue(); newContents.put(binding, validationStatusValue); } wrappedMap.putAll(newContents); @@ -146,8 +145,7 @@ public class ValidationStatusMap extends } private void removeElementChangeListener() { - for (Iterator it = dependencies.iterator(); it.hasNext();) { - IObservableValue observableValue = (IObservableValue) it.next(); + for (IObservableValue observableValue : dependencies) { observableValue.removeChangeListener(markDirtyChangeListener); } } @@ -160,7 +158,7 @@ public class ValidationStatusMap extends } @Override - public synchronized void addMapChangeListener(IMapChangeListener listener) { + public synchronized void addMapChangeListener(IMapChangeListener listener) { // this ensures that the next change will be seen by the new listener. recompute(); super.addMapChangeListener(listener); diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/ValidationStatusProviderModelsProperty.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/ValidationStatusProviderModelsProperty.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/ValidationStatusProviderModelsProperty.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/ValidationStatusProviderModelsProperty.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 263709) @@ -24,30 +27,30 @@ import org.eclipse.core.databinding.prop * @since 3.3 * */ -public class ValidationStatusProviderModelsProperty extends ListProperty { +public class ValidationStatusProviderModelsProperty extends ListProperty { @Override public Object getElementType() { return IObservable.class; } @Override - protected List doGetList(Object source) { - return ((ValidationStatusProvider) source).getModels(); + protected List doGetList(ValidationStatusProvider source) { + return source.getModels(); } @Override - protected void doSetList(Object source, List list) { + protected void doSetList(ValidationStatusProvider source, List list) { throw new UnsupportedOperationException(toString() + " is unmodifiable"); //$NON-NLS-1$ } @Override - protected void doUpdateList(Object source, ListDiff diff) { + protected void doUpdateList(ValidationStatusProvider source, ListDiff diff) { throw new UnsupportedOperationException(toString() + " is unmodifiable"); //$NON-NLS-1$ } @Override - public IObservableList observe(Realm realm, Object source) { - return ((ValidationStatusProvider) source).getModels(); + public IObservableList observe(Realm realm, ValidationStatusProvider source) { + return source.getModels(); } @Override diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/ValidationStatusProviderTargetsProperty.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/ValidationStatusProviderTargetsProperty.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/ValidationStatusProviderTargetsProperty.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/ValidationStatusProviderTargetsProperty.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 263709) @@ -24,30 +27,30 @@ import org.eclipse.core.databinding.prop * @since 3.3 * */ -public class ValidationStatusProviderTargetsProperty extends ListProperty { +public class ValidationStatusProviderTargetsProperty extends ListProperty { @Override public Object getElementType() { return IObservable.class; } @Override - protected List doGetList(Object source) { - return ((ValidationStatusProvider) source).getTargets(); + protected List doGetList(ValidationStatusProvider source) { + return source.getTargets(); } @Override - protected void doSetList(Object source, List list) { + protected void doSetList(ValidationStatusProvider source, List list) { throw new UnsupportedOperationException(toString() + " is unmodifiable"); //$NON-NLS-1$ } @Override - protected void doUpdateList(Object source, ListDiff diff) { + protected void doUpdateList(ValidationStatusProvider source, ListDiff diff) { throw new UnsupportedOperationException(toString() + " is unmodifiable"); //$NON-NLS-1$ } @Override - public IObservableList observe(Realm realm, Object source) { - return ((ValidationStatusProvider) source).getTargets(); + public IObservableList observe(Realm realm, ValidationStatusProvider source) { + return source.getTargets(); } @Override diff -pruN 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/ValidationStatusProviderValidationStatusProperty.java 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/ValidationStatusProviderValidationStatusProperty.java --- 4.8-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/ValidationStatusProviderValidationStatusProperty.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/ValidationStatusProviderValidationStatusProperty.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 263709) @@ -13,43 +16,46 @@ package org.eclipse.core.internal.databi import org.eclipse.core.databinding.ValidationStatusProvider; import org.eclipse.core.databinding.observable.value.IObservableValue; +import org.eclipse.core.databinding.observable.value.ValueDiff; import org.eclipse.core.databinding.property.INativePropertyListener; import org.eclipse.core.databinding.property.ISimplePropertyListener; import org.eclipse.core.databinding.property.value.SimpleValueProperty; +import org.eclipse.core.runtime.IStatus; /** * @since 3.3 * */ -public final class ValidationStatusProviderValidationStatusProperty extends - SimpleValueProperty { +public final class ValidationStatusProviderValidationStatusProperty + extends SimpleValueProperty> { @Override public Object getValueType() { return IObservableValue.class; } @Override - protected Object doGetValue(Object source) { - return ((ValidationStatusProvider) source).getValidationStatus(); + protected IObservableValue doGetValue(ValidationStatusProvider source) { + return source.getValidationStatus(); } @Override - protected void doSetValue(Object source, Object value) { + protected void doSetValue(ValidationStatusProvider source, IObservableValue value) { // no setter API } @Override - public INativePropertyListener adaptListener( - ISimplePropertyListener listener) { + public INativePropertyListener adaptListener( + ISimplePropertyListener>> listener) { // no listener API return null; } - protected void doAddListener(Object source, INativePropertyListener listener) { + protected void doAddListener(ValidationStatusProvider source, + INativePropertyListener listener) { } - protected void doRemoveListener(Object source, - INativePropertyListener listener) { + protected void doRemoveListener(ValidationStatusProvider source, + INativePropertyListener listener) { } @Override diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.beans/about.html 4.9-1/bundles/org.eclipse.core.databinding.beans/about.html --- 4.8-1/bundles/org.eclipse.core.databinding.beans/about.html 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.beans/about.html 2018-09-06 11:21:18.000000000 +0000 @@ -2,27 +2,35 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + About -

    About This Content

    - -

    June 2, 2006

    -

    License

    +

    About This Content

    -

    The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise -indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at http://www.eclipse.org/legal/epl-v10.html. -For purposes of the EPL, "Program" will mean the Content.

    +

    November 30, 2017

    +

    License

    -

    If you did not receive this Content directly from the Eclipse Foundation, the Content is -being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor's license that was -provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at http://www.eclipse.org.

    +

    + The Eclipse Foundation makes available all content in this plug-in + ("Content"). Unless otherwise indicated below, the Content + is provided to you under the terms and conditions of the Eclipse + Public License Version 2.0 ("EPL"). A copy of the EPL is + available at http://www.eclipse.org/legal/epl-2.0. + For purposes of the EPL, "Program" will mean the Content. +

    + +

    + If you did not receive this Content directly from the Eclipse + Foundation, the Content is being redistributed by another party + ("Redistributor") and different terms and conditions may + apply to your use of any object code in the Content. Check the + Redistributor's license that was provided with the Content. If no such + license exists, contact the Redistributor. Unless otherwise indicated + below, the terms and conditions of the EPL still apply to any source + code in the Content and such source code may be obtained at http://www.eclipse.org. +

    \ No newline at end of file diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.beans/build.properties 4.9-1/bundles/org.eclipse.core.databinding.beans/build.properties --- 4.8-1/bundles/org.eclipse.core.databinding.beans/build.properties 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.beans/build.properties 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2006, 2015 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 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.beans/META-INF/MANIFEST.MF 4.9-1/bundles/org.eclipse.core.databinding.beans/META-INF/MANIFEST.MF --- 4.8-1/bundles/org.eclipse.core.databinding.beans/META-INF/MANIFEST.MF 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.beans/META-INF/MANIFEST.MF 2018-09-06 11:21:18.000000000 +0000 @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.core.databinding.beans -Bundle-Version: 1.4.100.qualifier +Bundle-Version: 1.4.200.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.beans/plugin.properties 4.9-1/bundles/org.eclipse.core.databinding.beans/plugin.properties --- 4.8-1/bundles/org.eclipse.core.databinding.beans/plugin.properties 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.beans/plugin.properties 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2006 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 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.beans/pom.xml 4.9-1/bundles/org.eclipse.core.databinding.beans/pom.xml --- 4.8-1/bundles/org.eclipse.core.databinding.beans/pom.xml 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.beans/pom.xml 2018-09-06 11:21:18.000000000 +0000 @@ -15,12 +15,12 @@ eclipse.platform.ui eclipse.platform.ui - 4.8.0-SNAPSHOT + 4.9.0-SNAPSHOT ../../ org.eclipse.core org.eclipse.core.databinding.beans - 1.4.100-SNAPSHOT + 1.4.200-SNAPSHOT eclipse-plugin diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/databinding/beans/BeanProperties.java 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/databinding/beans/BeanProperties.java --- 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/databinding/beans/BeanProperties.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/databinding/beans/BeanProperties.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2016 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 194734) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/databinding/beans/BeansObservables.java 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/databinding/beans/BeansObservables.java --- 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/databinding/beans/BeansObservables.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/databinding/beans/BeansObservables.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2017 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/databinding/beans/IBeanListProperty.java 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/databinding/beans/IBeanListProperty.java --- 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/databinding/beans/IBeanListProperty.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/databinding/beans/IBeanListProperty.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 195222) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/databinding/beans/IBeanMapProperty.java 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/databinding/beans/IBeanMapProperty.java --- 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/databinding/beans/IBeanMapProperty.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/databinding/beans/IBeanMapProperty.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 195222) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/databinding/beans/IBeanObservable.java 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/databinding/beans/IBeanObservable.java --- 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/databinding/beans/IBeanObservable.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/databinding/beans/IBeanObservable.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007, 2015 Brad Reynolds and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Brad Reynolds - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/databinding/beans/IBeanProperty.java 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/databinding/beans/IBeanProperty.java --- 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/databinding/beans/IBeanProperty.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/databinding/beans/IBeanProperty.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 194734) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/databinding/beans/IBeanSetProperty.java 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/databinding/beans/IBeanSetProperty.java --- 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/databinding/beans/IBeanSetProperty.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/databinding/beans/IBeanSetProperty.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 195222) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/databinding/beans/IBeanValueProperty.java 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/databinding/beans/IBeanValueProperty.java --- 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/databinding/beans/IBeanValueProperty.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/databinding/beans/IBeanValueProperty.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 195222) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/databinding/beans/PojoObservables.java 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/databinding/beans/PojoObservables.java --- 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/databinding/beans/PojoObservables.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/databinding/beans/PojoObservables.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/databinding/beans/PojoProperties.java 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/databinding/beans/PojoProperties.java --- 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/databinding/beans/PojoProperties.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/databinding/beans/PojoProperties.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 194734) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/AnonymousBeanListProperty.java 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/AnonymousBeanListProperty.java --- 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/AnonymousBeanListProperty.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/AnonymousBeanListProperty.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 247997) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/AnonymousBeanMapProperty.java 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/AnonymousBeanMapProperty.java --- 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/AnonymousBeanMapProperty.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/AnonymousBeanMapProperty.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 247997) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/AnonymousBeanSetProperty.java 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/AnonymousBeanSetProperty.java --- 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/AnonymousBeanSetProperty.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/AnonymousBeanSetProperty.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 247997) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/AnonymousBeanValueProperty.java 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/AnonymousBeanValueProperty.java --- 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/AnonymousBeanValueProperty.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/AnonymousBeanValueProperty.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 247997) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/AnonymousPojoListProperty.java 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/AnonymousPojoListProperty.java --- 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/AnonymousPojoListProperty.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/AnonymousPojoListProperty.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 247997) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/AnonymousPojoMapProperty.java 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/AnonymousPojoMapProperty.java --- 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/AnonymousPojoMapProperty.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/AnonymousPojoMapProperty.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 247997) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/AnonymousPojoSetProperty.java 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/AnonymousPojoSetProperty.java --- 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/AnonymousPojoSetProperty.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/AnonymousPojoSetProperty.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 247997) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/AnonymousPojoValueProperty.java 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/AnonymousPojoValueProperty.java --- 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/AnonymousPojoValueProperty.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/AnonymousPojoValueProperty.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 247997) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/BeanListPropertyDecorator.java 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/BeanListPropertyDecorator.java --- 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/BeanListPropertyDecorator.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/BeanListPropertyDecorator.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 195222) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/BeanListProperty.java 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/BeanListProperty.java --- 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/BeanListProperty.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/BeanListProperty.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 194734) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/BeanMapPropertyDecorator.java 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/BeanMapPropertyDecorator.java --- 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/BeanMapPropertyDecorator.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/BeanMapPropertyDecorator.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 195222) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/BeanMapProperty.java 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/BeanMapProperty.java --- 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/BeanMapProperty.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/BeanMapProperty.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 194734) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/BeanObservableListDecorator.java 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/BeanObservableListDecorator.java --- 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/BeanObservableListDecorator.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/BeanObservableListDecorator.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007, 2015 Brad Reynolds and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Brad Reynolds - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/BeanObservableMapDecorator.java 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/BeanObservableMapDecorator.java --- 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/BeanObservableMapDecorator.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/BeanObservableMapDecorator.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 221704) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/BeanObservableSetDecorator.java 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/BeanObservableSetDecorator.java --- 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/BeanObservableSetDecorator.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/BeanObservableSetDecorator.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007, 2015 Brad Reynolds and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Brad Reynolds - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/BeanObservableValueDecorator.java 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/BeanObservableValueDecorator.java --- 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/BeanObservableValueDecorator.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/BeanObservableValueDecorator.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007, 2015 Brad Reynolds and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Brad Reynolds - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/BeanPropertyHelper.java 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/BeanPropertyHelper.java --- 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/BeanPropertyHelper.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/BeanPropertyHelper.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2014 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 194734) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/BeanPropertyListener.java 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/BeanPropertyListener.java --- 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/BeanPropertyListener.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/BeanPropertyListener.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 265561) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/BeanPropertyListenerSupport.java 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/BeanPropertyListenerSupport.java --- 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/BeanPropertyListenerSupport.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/BeanPropertyListenerSupport.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/BeanSetPropertyDecorator.java 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/BeanSetPropertyDecorator.java --- 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/BeanSetPropertyDecorator.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/BeanSetPropertyDecorator.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 195222) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/BeanSetProperty.java 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/BeanSetProperty.java --- 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/BeanSetProperty.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/BeanSetProperty.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 194734) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/BeanValuePropertyDecorator.java 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/BeanValuePropertyDecorator.java --- 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/BeanValuePropertyDecorator.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/BeanValuePropertyDecorator.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 195222) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/BeanValueProperty.java 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/BeanValueProperty.java --- 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/BeanValueProperty.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/BeanValueProperty.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 194734) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/PojoListPropertyDecorator.java 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/PojoListPropertyDecorator.java --- 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/PojoListPropertyDecorator.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/PojoListPropertyDecorator.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 195222) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/PojoListProperty.java 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/PojoListProperty.java --- 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/PojoListProperty.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/PojoListProperty.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 194734) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/PojoMapPropertyDecorator.java 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/PojoMapPropertyDecorator.java --- 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/PojoMapPropertyDecorator.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/PojoMapPropertyDecorator.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 195222) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/PojoMapProperty.java 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/PojoMapProperty.java --- 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/PojoMapProperty.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/PojoMapProperty.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 194734) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/PojoSetPropertyDecorator.java 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/PojoSetPropertyDecorator.java --- 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/PojoSetPropertyDecorator.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/PojoSetPropertyDecorator.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 195222) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/PojoSetProperty.java 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/PojoSetProperty.java --- 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/PojoSetProperty.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/PojoSetProperty.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 194734) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/PojoValuePropertyDecorator.java 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/PojoValuePropertyDecorator.java --- 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/PojoValuePropertyDecorator.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/PojoValuePropertyDecorator.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 195222) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/PojoValueProperty.java 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/PojoValueProperty.java --- 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/PojoValueProperty.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/PojoValueProperty.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 194734) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/Util.java 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/Util.java --- 4.8-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/Util.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/beans/Util.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/about.html 4.9-1/bundles/org.eclipse.core.databinding.observable/about.html --- 4.8-1/bundles/org.eclipse.core.databinding.observable/about.html 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/about.html 2018-09-06 11:21:18.000000000 +0000 @@ -2,27 +2,35 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + About -

    About This Content

    - -

    June 2, 2006

    -

    License

    +

    About This Content

    -

    The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise -indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at http://www.eclipse.org/legal/epl-v10.html. -For purposes of the EPL, "Program" will mean the Content.

    +

    November 30, 2017

    +

    License

    -

    If you did not receive this Content directly from the Eclipse Foundation, the Content is -being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor's license that was -provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at http://www.eclipse.org.

    +

    + The Eclipse Foundation makes available all content in this plug-in + ("Content"). Unless otherwise indicated below, the Content + is provided to you under the terms and conditions of the Eclipse + Public License Version 2.0 ("EPL"). A copy of the EPL is + available at http://www.eclipse.org/legal/epl-2.0. + For purposes of the EPL, "Program" will mean the Content. +

    + +

    + If you did not receive this Content directly from the Eclipse + Foundation, the Content is being redistributed by another party + ("Redistributor") and different terms and conditions may + apply to your use of any object code in the Content. Check the + Redistributor's license that was provided with the Content. If no such + license exists, contact the Redistributor. Unless otherwise indicated + below, the terms and conditions of the EPL still apply to any source + code in the Content and such source code may be obtained at http://www.eclipse.org. +

    \ No newline at end of file diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/build.properties 4.9-1/bundles/org.eclipse.core.databinding.observable/build.properties --- 4.8-1/bundles/org.eclipse.core.databinding.observable/build.properties 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/build.properties 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2009, 2015 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 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/META-INF/MANIFEST.MF 4.9-1/bundles/org.eclipse.core.databinding.observable/META-INF/MANIFEST.MF --- 4.8-1/bundles/org.eclipse.core.databinding.observable/META-INF/MANIFEST.MF 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/META-INF/MANIFEST.MF 2018-09-06 11:21:18.000000000 +0000 @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.core.databinding.observable -Bundle-Version: 1.6.200.qualifier +Bundle-Version: 1.6.300.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/plugin.properties 4.9-1/bundles/org.eclipse.core.databinding.observable/plugin.properties --- 4.8-1/bundles/org.eclipse.core.databinding.observable/plugin.properties 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/plugin.properties 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2000, 2008 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 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/pom.xml 4.9-1/bundles/org.eclipse.core.databinding.observable/pom.xml --- 4.8-1/bundles/org.eclipse.core.databinding.observable/pom.xml 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/pom.xml 2018-09-06 11:21:18.000000000 +0000 @@ -16,12 +16,12 @@ eclipse.platform.ui eclipse.platform.ui - 4.8.0-SNAPSHOT + 4.9.0-SNAPSHOT ../../ org.eclipse.core org.eclipse.core.databinding.observable - 1.6.200-SNAPSHOT + 1.6.300-SNAPSHOT eclipse-plugin diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/AbstractObservable.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/AbstractObservable.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/AbstractObservable.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/AbstractObservable.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/ChangeEvent.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/ChangeEvent.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/ChangeEvent.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/ChangeEvent.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/ChangeManager.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/ChangeManager.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/ChangeManager.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/ChangeManager.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2016 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/ChangeSupport.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/ChangeSupport.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/ChangeSupport.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/ChangeSupport.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/DecoratingObservableCollection.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/DecoratingObservableCollection.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/DecoratingObservableCollection.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/DecoratingObservableCollection.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 237718) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/DecoratingObservable.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/DecoratingObservable.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/DecoratingObservable.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/DecoratingObservable.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2017 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 237718) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/Diffs.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/Diffs.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/Diffs.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/Diffs.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/DisposeEvent.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/DisposeEvent.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/DisposeEvent.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/DisposeEvent.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 146397) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/IChangeListener.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/IChangeListener.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/IChangeListener.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/IChangeListener.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/IDecoratingObservable.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/IDecoratingObservable.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/IDecoratingObservable.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/IDecoratingObservable.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 237718) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/IDiff.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/IDiff.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/IDiff.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/IDiff.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 194734) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/IDisposeListener.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/IDisposeListener.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/IDisposeListener.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/IDisposeListener.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 146397) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/IObservableCollection.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/IObservableCollection.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/IObservableCollection.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/IObservableCollection.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/IObservable.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/IObservable.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/IObservable.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/IObservable.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/IObservablesListener.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/IObservablesListener.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/IObservablesListener.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/IObservablesListener.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/IObserving.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/IObserving.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/IObserving.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/IObserving.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/IStaleListener.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/IStaleListener.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/IStaleListener.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/IStaleListener.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/list/AbstractObservableList.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/list/AbstractObservableList.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/list/AbstractObservableList.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/list/AbstractObservableList.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/list/ComputedList.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/list/ComputedList.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/list/ComputedList.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/list/ComputedList.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /************************************************************************************************************ * Copyright (c) 2007, 2017 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/list/DecoratingObservableList.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/list/DecoratingObservableList.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/list/DecoratingObservableList.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/list/DecoratingObservableList.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2017 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 237718) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/list/IListChangeListener.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/list/IListChangeListener.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/list/IListChangeListener.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/list/IListChangeListener.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/list/IObservableList.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/list/IObservableList.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/list/IObservableList.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/list/IObservableList.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/list/ListChangeEvent.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/list/ListChangeEvent.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/list/ListChangeEvent.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/list/ListChangeEvent.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/list/ListDiffEntry.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/list/ListDiffEntry.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/list/ListDiffEntry.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/list/ListDiffEntry.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/list/ListDiff.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/list/ListDiff.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/list/ListDiff.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/list/ListDiff.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation @@ -66,7 +69,7 @@ public abstract class ListDiff implem * @see ListDiffVisitor * @since 1.1 */ - public void accept(ListDiffVisitor visitor) { + public void accept(ListDiffVisitor visitor) { ListDiffEntry[] differences = getDifferences(); for (int i = 0; i < differences.length; i++) { ListDiffEntry entry = differences[i]; @@ -169,7 +172,7 @@ public abstract class ListDiff implem * the list to which the diff will be applied * @since 1.2 */ - public void applyTo(final List list) { + public void applyTo(final List list) { accept(new ListDiffVisitor() { @Override public void handleAdd(int index, E element) { diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/list/ListDiffVisitor.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/list/ListDiffVisitor.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/list/ListDiffVisitor.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/list/ListDiffVisitor.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 208858) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/list/MultiList.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/list/MultiList.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/list/MultiList.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/list/MultiList.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2017 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 222289) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/list/ObservableList.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/list/ObservableList.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/list/ObservableList.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/list/ObservableList.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/list/WritableList.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/list/WritableList.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/list/WritableList.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/list/WritableList.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/map/AbstractObservableMap.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/map/AbstractObservableMap.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/map/AbstractObservableMap.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/map/AbstractObservableMap.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/map/BidiObservableMap.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/map/BidiObservableMap.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/map/BidiObservableMap.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/map/BidiObservableMap.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/map/BidirectionalMap.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/map/BidirectionalMap.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/map/BidirectionalMap.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/map/BidirectionalMap.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2017 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/map/CompositeMap.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/map/CompositeMap.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/map/CompositeMap.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/map/CompositeMap.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2017 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/map/ComputedObservableMap.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/map/ComputedObservableMap.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/map/ComputedObservableMap.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/map/ComputedObservableMap.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2017 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/map/DecoratingObservableMap.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/map/DecoratingObservableMap.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/map/DecoratingObservableMap.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/map/DecoratingObservableMap.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2017 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 237718) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/map/IMapChangeListener.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/map/IMapChangeListener.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/map/IMapChangeListener.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/map/IMapChangeListener.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/map/IObservableMap.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/map/IObservableMap.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/map/IObservableMap.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/map/IObservableMap.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/map/MapChangeEvent.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/map/MapChangeEvent.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/map/MapChangeEvent.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/map/MapChangeEvent.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/map/MapDiff.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/map/MapDiff.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/map/MapDiff.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/map/MapDiff.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation @@ -52,7 +55,7 @@ public abstract class MapDiff impl * the map to which the diff will be applied * @since 1.2 */ - public void applyTo(Map map) { + public void applyTo(Map map) { for (K key : getAddedKeys()) { map.put(key, getNewValue(key)); } diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/map/ObservableMap.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/map/ObservableMap.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/map/ObservableMap.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/map/ObservableMap.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/map/WritableMap.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/map/WritableMap.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/map/WritableMap.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/map/WritableMap.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/masterdetail/IObservableFactory.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/masterdetail/IObservableFactory.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/masterdetail/IObservableFactory.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/masterdetail/IObservableFactory.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/masterdetail/MasterDetailObservables.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/masterdetail/MasterDetailObservables.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/masterdetail/MasterDetailObservables.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/masterdetail/MasterDetailObservables.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/ObservableEvent.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/ObservableEvent.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/ObservableEvent.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/ObservableEvent.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/Observables.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/Observables.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/Observables.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/Observables.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2017 Cerner 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Brad Reynolds - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/ObservableTracker.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/ObservableTracker.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/ObservableTracker.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/ObservableTracker.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/Realm.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/Realm.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/Realm.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/Realm.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/set/AbstractObservableSet.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/set/AbstractObservableSet.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/set/AbstractObservableSet.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/set/AbstractObservableSet.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/set/ComputedSet.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/set/ComputedSet.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/set/ComputedSet.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/set/ComputedSet.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2017 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 237703) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/set/DecoratingObservableSet.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/set/DecoratingObservableSet.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/set/DecoratingObservableSet.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/set/DecoratingObservableSet.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2017 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 237718) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/set/IObservableSet.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/set/IObservableSet.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/set/IObservableSet.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/set/IObservableSet.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/set/ISetChangeListener.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/set/ISetChangeListener.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/set/ISetChangeListener.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/set/ISetChangeListener.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/set/ListToSetAdapter.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/set/ListToSetAdapter.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/set/ListToSetAdapter.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/set/ListToSetAdapter.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2017 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/set/MappedSet.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/set/MappedSet.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/set/MappedSet.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/set/MappedSet.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/set/ObservableSet.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/set/ObservableSet.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/set/ObservableSet.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/set/ObservableSet.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/set/SetChangeEvent.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/set/SetChangeEvent.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/set/SetChangeEvent.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/set/SetChangeEvent.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/set/SetDiff.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/set/SetDiff.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/set/SetDiff.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/set/SetDiff.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation @@ -56,7 +59,7 @@ public abstract class SetDiff impleme * the set to which the diff will be applied * @since 1.2 */ - public void applyTo(Set set) { + public void applyTo(Set set) { set.addAll(getAdditions()); set.removeAll(getRemovals()); } diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/set/UnionSet.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/set/UnionSet.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/set/UnionSet.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/set/UnionSet.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2017 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/set/WritableSet.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/set/WritableSet.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/set/WritableSet.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/set/WritableSet.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006-2008, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation @@ -184,7 +187,7 @@ public class WritableSet extends Obse * can be null * @return new instance with the default realm */ - public static WritableSet withElementType(Object elementType) { - return new WritableSet(Realm.getDefault(), new HashSet(), elementType); + public static WritableSet withElementType(Object elementType) { + return new WritableSet(Realm.getDefault(), new HashSet(), elementType); } } diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/sideeffect/CompositeSideEffect.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/sideeffect/CompositeSideEffect.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/sideeffect/CompositeSideEffect.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/sideeffect/CompositeSideEffect.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2016 vogella GmbH and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Simon Scholz - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/sideeffect/ISideEffectFactory.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/sideeffect/ISideEffectFactory.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/sideeffect/ISideEffectFactory.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/sideeffect/ISideEffectFactory.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2016 vogella GmbH and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Simon Scholz - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/sideeffect/ISideEffect.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/sideeffect/ISideEffect.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/sideeffect/ISideEffect.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/sideeffect/ISideEffect.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2015 Google, Inc. and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Stefan Xenos (Google) - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/StaleEvent.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/StaleEvent.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/StaleEvent.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/StaleEvent.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/value/AbstractObservableValue.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/value/AbstractObservableValue.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/value/AbstractObservableValue.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/value/AbstractObservableValue.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/value/AbstractVetoableValue.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/value/AbstractVetoableValue.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/value/AbstractVetoableValue.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/value/AbstractVetoableValue.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/value/ChangeVetoException.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/value/ChangeVetoException.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/value/ChangeVetoException.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/value/ChangeVetoException.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/value/ComputedValue.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/value/ComputedValue.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/value/ComputedValue.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/value/ComputedValue.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2017 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/value/DateAndTimeObservableValue.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/value/DateAndTimeObservableValue.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/value/DateAndTimeObservableValue.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/value/DateAndTimeObservableValue.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 169876) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/value/DecoratingObservableValue.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/value/DecoratingObservableValue.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/value/DecoratingObservableValue.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/value/DecoratingObservableValue.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2017 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 237718) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/value/DecoratingVetoableValue.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/value/DecoratingVetoableValue.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/value/DecoratingVetoableValue.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/value/DecoratingVetoableValue.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 263691) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/value/DuplexingObservableValue.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/value/DuplexingObservableValue.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/value/DuplexingObservableValue.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/value/DuplexingObservableValue.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009, 2017 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 175735) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/value/IObservableValue.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/value/IObservableValue.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/value/IObservableValue.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/value/IObservableValue.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/value/IValueChangeListener.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/value/IValueChangeListener.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/value/IValueChangeListener.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/value/IValueChangeListener.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/value/IValueChangingListener.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/value/IValueChangingListener.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/value/IValueChangingListener.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/value/IValueChangingListener.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/value/IVetoableValue.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/value/IVetoableValue.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/value/IVetoableValue.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/value/IVetoableValue.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/value/SelectObservableValue.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/value/SelectObservableValue.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/value/SelectObservableValue.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/value/SelectObservableValue.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2017 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 249992) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/value/ValueChangeEvent.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/value/ValueChangeEvent.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/value/ValueChangeEvent.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/value/ValueChangeEvent.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/value/ValueChangingEvent.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/value/ValueChangingEvent.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/value/ValueChangingEvent.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/value/ValueChangingEvent.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/value/ValueDiff.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/value/ValueDiff.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/value/ValueDiff.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/value/ValueDiff.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/value/WritableValue.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/value/WritableValue.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/value/WritableValue.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/value/WritableValue.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/util/ILogger.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/util/ILogger.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/util/ILogger.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/util/ILogger.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Chris Gross (schtoo@schtoo.com) - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/util/Policy.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/util/Policy.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/util/Policy.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/util/Policy.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2004, 2017 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/identity/IdentityMap.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/identity/IdentityMap.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/identity/IdentityMap.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/identity/IdentityMap.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 215531) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/identity/IdentityObservableSet.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/identity/IdentityObservableSet.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/identity/IdentityObservableSet.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/identity/IdentityObservableSet.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 215531) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/identity/IdentitySet.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/identity/IdentitySet.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/identity/IdentitySet.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/identity/IdentitySet.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 215531) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/identity/IdentityWrapper.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/identity/IdentityWrapper.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/identity/IdentityWrapper.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/identity/IdentityWrapper.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/ConstantObservableValue.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/ConstantObservableValue.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/ConstantObservableValue.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/ConstantObservableValue.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2015 Matt Carter and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matt Carter - initial API and implementation (bug 212518) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/DelayedObservableValue.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/DelayedObservableValue.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/DelayedObservableValue.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/DelayedObservableValue.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 180746) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/EmptyObservableList.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/EmptyObservableList.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/EmptyObservableList.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/EmptyObservableList.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/EmptyObservableSet.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/EmptyObservableSet.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/EmptyObservableSet.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/EmptyObservableSet.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/IStalenessConsumer.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/IStalenessConsumer.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/IStalenessConsumer.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/IStalenessConsumer.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/MapEntryObservableValue.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/MapEntryObservableValue.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/MapEntryObservableValue.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/MapEntryObservableValue.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2017 Marko Topolnik and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Marko Topolnik - initial API and implementation (bug 184830) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/masterdetail/DetailObservableHelper.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/masterdetail/DetailObservableHelper.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/masterdetail/DetailObservableHelper.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/masterdetail/DetailObservableHelper.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2009 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 246782) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/masterdetail/DetailObservableList.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/masterdetail/DetailObservableList.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/masterdetail/DetailObservableList.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/masterdetail/DetailObservableList.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2017 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/masterdetail/DetailObservableMap.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/masterdetail/DetailObservableMap.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/masterdetail/DetailObservableMap.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/masterdetail/DetailObservableMap.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2017 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 221704) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/masterdetail/DetailObservableSet.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/masterdetail/DetailObservableSet.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/masterdetail/DetailObservableSet.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/masterdetail/DetailObservableSet.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2017 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/masterdetail/DetailObservableValue.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/masterdetail/DetailObservableValue.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/masterdetail/DetailObservableValue.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/masterdetail/DetailObservableValue.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2005, 2017 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/masterdetail/ListDetailValueObservableList.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/masterdetail/ListDetailValueObservableList.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/masterdetail/ListDetailValueObservableList.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/masterdetail/ListDetailValueObservableList.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2010, 2017 Ovidio Mallo and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Ovidio Mallo - initial API and implementation (bug 305367) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/masterdetail/MapDetailValueObservableMap.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/masterdetail/MapDetailValueObservableMap.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/masterdetail/MapDetailValueObservableMap.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/masterdetail/MapDetailValueObservableMap.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2010, 2017 Ovidio Mallo and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Ovidio Mallo - initial API and implementation (bug 305367) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/masterdetail/SetDetailValueObservableMap.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/masterdetail/SetDetailValueObservableMap.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/masterdetail/SetDetailValueObservableMap.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/masterdetail/SetDetailValueObservableMap.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2010, 2017 Ovidio Mallo and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Ovidio Mallo - initial API and implementation (bug 305367) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/Queue.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/Queue.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/Queue.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/Queue.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/sideeffect/SideEffectFactory.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/sideeffect/SideEffectFactory.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/sideeffect/SideEffectFactory.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/sideeffect/SideEffectFactory.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2016 vogella GmbH and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Simon Scholz - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/sideeffect/SideEffect.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/sideeffect/SideEffect.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/sideeffect/SideEffect.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/sideeffect/SideEffect.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2015 Google, Inc. and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Stefan Xenos (Google) - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/StalenessObservableValue.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/StalenessObservableValue.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/StalenessObservableValue.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/StalenessObservableValue.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Boris Bokowski, IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/StalenessTracker.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/StalenessTracker.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/StalenessTracker.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/StalenessTracker.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/UnmodifiableObservableList.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/UnmodifiableObservableList.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/UnmodifiableObservableList.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/UnmodifiableObservableList.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006-2008, 2015 Cerner 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Brad Reynolds - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/UnmodifiableObservableMap.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/UnmodifiableObservableMap.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/UnmodifiableObservableMap.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/UnmodifiableObservableMap.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - bug 237718 diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/UnmodifiableObservableSet.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/UnmodifiableObservableSet.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/UnmodifiableObservableSet.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/UnmodifiableObservableSet.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2007, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 208332) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/UnmodifiableObservableValue.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/UnmodifiableObservableValue.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/UnmodifiableObservableValue.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/UnmodifiableObservableValue.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 219909) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/Util.java 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/Util.java --- 4.8-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/Util.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/Util.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.property/about.html 4.9-1/bundles/org.eclipse.core.databinding.property/about.html --- 4.8-1/bundles/org.eclipse.core.databinding.property/about.html 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.property/about.html 2018-09-06 11:21:18.000000000 +0000 @@ -2,27 +2,35 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + About -

    About This Content

    - -

    June 2, 2006

    -

    License

    +

    About This Content

    -

    The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise -indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at http://www.eclipse.org/legal/epl-v10.html. -For purposes of the EPL, "Program" will mean the Content.

    +

    November 30, 2017

    +

    License

    -

    If you did not receive this Content directly from the Eclipse Foundation, the Content is -being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor's license that was -provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at http://www.eclipse.org.

    +

    + The Eclipse Foundation makes available all content in this plug-in + ("Content"). Unless otherwise indicated below, the Content + is provided to you under the terms and conditions of the Eclipse + Public License Version 2.0 ("EPL"). A copy of the EPL is + available at http://www.eclipse.org/legal/epl-2.0. + For purposes of the EPL, "Program" will mean the Content. +

    + +

    + If you did not receive this Content directly from the Eclipse + Foundation, the Content is being redistributed by another party + ("Redistributor") and different terms and conditions may + apply to your use of any object code in the Content. Check the + Redistributor's license that was provided with the Content. If no such + license exists, contact the Redistributor. Unless otherwise indicated + below, the terms and conditions of the EPL still apply to any source + code in the Content and such source code may be obtained at http://www.eclipse.org. +

    \ No newline at end of file diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.property/build.properties 4.9-1/bundles/org.eclipse.core.databinding.property/build.properties --- 4.8-1/bundles/org.eclipse.core.databinding.property/build.properties 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.property/build.properties 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2009, 2015 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 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.property/META-INF/MANIFEST.MF 4.9-1/bundles/org.eclipse.core.databinding.property/META-INF/MANIFEST.MF --- 4.8-1/bundles/org.eclipse.core.databinding.property/META-INF/MANIFEST.MF 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.property/META-INF/MANIFEST.MF 2018-09-06 11:21:18.000000000 +0000 @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.core.databinding.property -Bundle-Version: 1.6.200.qualifier +Bundle-Version: 1.6.300.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.property/plugin.properties 4.9-1/bundles/org.eclipse.core.databinding.property/plugin.properties --- 4.8-1/bundles/org.eclipse.core.databinding.property/plugin.properties 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.property/plugin.properties 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2000, 2012 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 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.property/pom.xml 4.9-1/bundles/org.eclipse.core.databinding.property/pom.xml --- 4.8-1/bundles/org.eclipse.core.databinding.property/pom.xml 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.property/pom.xml 2018-09-06 11:21:18.000000000 +0000 @@ -15,12 +15,12 @@ eclipse.platform.ui eclipse.platform.ui - 4.8.0-SNAPSHOT + 4.9.0-SNAPSHOT ../../ org.eclipse.core org.eclipse.core.databinding.property - 1.6.200-SNAPSHOT + 1.6.300-SNAPSHOT eclipse-plugin diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/INativePropertyListener.java 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/INativePropertyListener.java --- 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/INativePropertyListener.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/INativePropertyListener.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 194734) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/IProperty.java 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/IProperty.java --- 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/IProperty.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/IProperty.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 194734) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/IPropertyObservable.java 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/IPropertyObservable.java --- 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/IPropertyObservable.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/IPropertyObservable.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 194734) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/ISimplePropertyListener.java 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/ISimplePropertyListener.java --- 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/ISimplePropertyListener.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/ISimplePropertyListener.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 194734) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/list/DelegatingListProperty.java 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/list/DelegatingListProperty.java --- 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/list/DelegatingListProperty.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/list/DelegatingListProperty.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 247997) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/list/IListProperty.java 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/list/IListProperty.java --- 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/list/IListProperty.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/list/IListProperty.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 194734) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/list/ListProperty.java 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/list/ListProperty.java --- 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/list/ListProperty.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/list/ListProperty.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2017 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 194734) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/list/MultiListProperty.java 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/list/MultiListProperty.java --- 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/list/MultiListProperty.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/list/MultiListProperty.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 265727) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/list/SimpleListProperty.java 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/list/SimpleListProperty.java --- 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/list/SimpleListProperty.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/list/SimpleListProperty.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 194734) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/map/DelegatingMapProperty.java 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/map/DelegatingMapProperty.java --- 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/map/DelegatingMapProperty.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/map/DelegatingMapProperty.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 247997) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/map/IMapProperty.java 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/map/IMapProperty.java --- 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/map/IMapProperty.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/map/IMapProperty.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 194734) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/map/MapProperty.java 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/map/MapProperty.java --- 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/map/MapProperty.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/map/MapProperty.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2017 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 194734) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/map/SimpleMapProperty.java 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/map/SimpleMapProperty.java --- 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/map/SimpleMapProperty.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/map/SimpleMapProperty.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/NativePropertyListener.java 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/NativePropertyListener.java --- 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/NativePropertyListener.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/NativePropertyListener.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bugs 265561, 262287) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/Properties.java 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/Properties.java --- 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/Properties.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/Properties.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 194734) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/set/DelegatingSetProperty.java 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/set/DelegatingSetProperty.java --- 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/set/DelegatingSetProperty.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/set/DelegatingSetProperty.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 247997) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/set/ISetProperty.java 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/set/ISetProperty.java --- 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/set/ISetProperty.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/set/ISetProperty.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 194734) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/set/SetProperty.java 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/set/SetProperty.java --- 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/set/SetProperty.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/set/SetProperty.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2017 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 194734) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/set/SimpleSetProperty.java 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/set/SimpleSetProperty.java --- 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/set/SimpleSetProperty.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/set/SimpleSetProperty.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/set/UnionSetProperty.java 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/set/UnionSetProperty.java --- 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/set/UnionSetProperty.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/set/UnionSetProperty.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 265727) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/SimplePropertyEvent.java 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/SimplePropertyEvent.java --- 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/SimplePropertyEvent.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/SimplePropertyEvent.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 194734) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/value/DelegatingValueProperty.java 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/value/DelegatingValueProperty.java --- 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/value/DelegatingValueProperty.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/value/DelegatingValueProperty.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 247997) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/value/IValueProperty.java 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/value/IValueProperty.java --- 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/value/IValueProperty.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/value/IValueProperty.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 194734) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/value/SimpleValueProperty.java 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/value/SimpleValueProperty.java --- 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/value/SimpleValueProperty.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/value/SimpleValueProperty.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 194734) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/value/ValueProperty.java 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/value/ValueProperty.java --- 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/value/ValueProperty.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/databinding/property/value/ValueProperty.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2017 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 194734) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/list/SelfListProperty.java 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/list/SelfListProperty.java --- 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/list/SelfListProperty.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/list/SelfListProperty.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 263868) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/list/SimplePropertyObservableList.java 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/list/SimplePropertyObservableList.java --- 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/list/SimplePropertyObservableList.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/list/SimplePropertyObservableList.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2017 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 194734) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/ListPropertyDetailValuesList.java 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/ListPropertyDetailValuesList.java --- 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/ListPropertyDetailValuesList.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/ListPropertyDetailValuesList.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 194734) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/map/SelfMapProperty.java 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/map/SelfMapProperty.java --- 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/map/SelfMapProperty.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/map/SelfMapProperty.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 263868) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/map/SimplePropertyObservableMap.java 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/map/SimplePropertyObservableMap.java --- 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/map/SimplePropertyObservableMap.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/map/SimplePropertyObservableMap.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2017 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 194734) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/MapPropertyDetailValuesMap.java 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/MapPropertyDetailValuesMap.java --- 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/MapPropertyDetailValuesMap.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/MapPropertyDetailValuesMap.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 194734) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/PropertyObservableUtil.java 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/PropertyObservableUtil.java --- 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/PropertyObservableUtil.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/PropertyObservableUtil.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009, 2017 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 194734) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/set/SelfSetProperty.java 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/set/SelfSetProperty.java --- 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/set/SelfSetProperty.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/set/SelfSetProperty.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 263868) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/set/SimplePropertyObservableSet.java 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/set/SimplePropertyObservableSet.java --- 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/set/SimplePropertyObservableSet.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/set/SimplePropertyObservableSet.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2017 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 194734) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/SetPropertyDetailValuesMap.java 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/SetPropertyDetailValuesMap.java --- 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/SetPropertyDetailValuesMap.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/SetPropertyDetailValuesMap.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 194734) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/Util.java 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/Util.java --- 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/Util.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/Util.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2006, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/value/DelegatingCache.java 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/value/DelegatingCache.java --- 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/value/DelegatingCache.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/value/DelegatingCache.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009, 2017 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 194734) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/value/ListDelegatingValueObservableList.java 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/value/ListDelegatingValueObservableList.java --- 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/value/ListDelegatingValueObservableList.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/value/ListDelegatingValueObservableList.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 194734) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/value/ListSimpleValueObservableList.java 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/value/ListSimpleValueObservableList.java --- 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/value/ListSimpleValueObservableList.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/value/ListSimpleValueObservableList.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2017 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 194734) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/value/MapDelegatingValueObservableMap.java 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/value/MapDelegatingValueObservableMap.java --- 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/value/MapDelegatingValueObservableMap.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/value/MapDelegatingValueObservableMap.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2017 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 194734) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/value/MapSimpleValueObservableMap.java 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/value/MapSimpleValueObservableMap.java --- 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/value/MapSimpleValueObservableMap.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/value/MapSimpleValueObservableMap.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2017 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 194734) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/value/ObservableValueProperty.java 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/value/ObservableValueProperty.java --- 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/value/ObservableValueProperty.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/value/ObservableValueProperty.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 263709) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/value/SelfValueProperty.java 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/value/SelfValueProperty.java --- 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/value/SelfValueProperty.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/value/SelfValueProperty.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 263868) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/value/SetDelegatingValueObservableMap.java 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/value/SetDelegatingValueObservableMap.java --- 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/value/SetDelegatingValueObservableMap.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/value/SetDelegatingValueObservableMap.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2017 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 194734) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/value/SetSimpleValueObservableMap.java 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/value/SetSimpleValueObservableMap.java --- 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/value/SetSimpleValueObservableMap.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/value/SetSimpleValueObservableMap.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2017 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 194734) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/value/SimplePropertyObservableValue.java 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/value/SimplePropertyObservableValue.java --- 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/value/SimplePropertyObservableValue.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/value/SimplePropertyObservableValue.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2017 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 194734) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/ValuePropertyDetailList.java 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/ValuePropertyDetailList.java --- 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/ValuePropertyDetailList.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/ValuePropertyDetailList.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 194734) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/ValuePropertyDetailMap.java 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/ValuePropertyDetailMap.java --- 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/ValuePropertyDetailMap.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/ValuePropertyDetailMap.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 194734) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/ValuePropertyDetailSet.java 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/ValuePropertyDetailSet.java --- 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/ValuePropertyDetailSet.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/ValuePropertyDetailSet.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 194734) diff -pruN 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/ValuePropertyDetailValue.java 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/ValuePropertyDetailValue.java --- 4.8-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/ValuePropertyDetailValue.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.core.databinding.property/src/org/eclipse/core/internal/databinding/property/ValuePropertyDetailValue.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 Matthew Hall and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Matthew Hall - initial API and implementation (bug 194734) diff -pruN 4.8-1/bundles/org.eclipse.e4.core.commands/about.html 4.9-1/bundles/org.eclipse.e4.core.commands/about.html --- 4.8-1/bundles/org.eclipse.e4.core.commands/about.html 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.commands/about.html 2018-09-06 11:21:18.000000000 +0000 @@ -2,27 +2,35 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + About -

    About This Content

    - -

    November 20, 2008

    -

    License

    +

    About This Content

    -

    The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise -indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at http://www.eclipse.org/legal/epl-v10.html. -For purposes of the EPL, "Program" will mean the Content.

    +

    November 30, 2017

    +

    License

    -

    If you did not receive this Content directly from the Eclipse Foundation, the Content is -being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor's license that was -provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at http://www.eclipse.org.

    +

    + The Eclipse Foundation makes available all content in this plug-in + ("Content"). Unless otherwise indicated below, the Content + is provided to you under the terms and conditions of the Eclipse + Public License Version 2.0 ("EPL"). A copy of the EPL is + available at http://www.eclipse.org/legal/epl-2.0. + For purposes of the EPL, "Program" will mean the Content. +

    + +

    + If you did not receive this Content directly from the Eclipse + Foundation, the Content is being redistributed by another party + ("Redistributor") and different terms and conditions may + apply to your use of any object code in the Content. Check the + Redistributor's license that was provided with the Content. If no such + license exists, contact the Redistributor. Unless otherwise indicated + below, the terms and conditions of the EPL still apply to any source + code in the Content and such source code may be obtained at http://www.eclipse.org. +

    \ No newline at end of file diff -pruN 4.8-1/bundles/org.eclipse.e4.core.commands/build.properties 4.9-1/bundles/org.eclipse.e4.core.commands/build.properties --- 4.8-1/bundles/org.eclipse.e4.core.commands/build.properties 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.commands/build.properties 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2013, 2015 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 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.core.commands/META-INF/MANIFEST.MF 4.9-1/bundles/org.eclipse.e4.core.commands/META-INF/MANIFEST.MF --- 4.8-1/bundles/org.eclipse.e4.core.commands/META-INF/MANIFEST.MF 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.commands/META-INF/MANIFEST.MF 2018-09-06 11:21:18.000000000 +0000 @@ -4,7 +4,7 @@ Bundle-SymbolicName: org.eclipse.e4.core Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin -Bundle-Version: 0.12.200.qualifier +Bundle-Version: 0.12.300.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: javax.annotation, javax.inject;version="1.0.0", diff -pruN 4.8-1/bundles/org.eclipse.e4.core.commands/plugin.properties 4.9-1/bundles/org.eclipse.e4.core.commands/plugin.properties --- 4.8-1/bundles/org.eclipse.e4.core.commands/plugin.properties 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.commands/plugin.properties 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2010 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 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.core.commands/pom.xml 4.9-1/bundles/org.eclipse.e4.core.commands/pom.xml --- 4.8-1/bundles/org.eclipse.e4.core.commands/pom.xml 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.commands/pom.xml 2018-09-06 11:21:18.000000000 +0000 @@ -14,11 +14,11 @@ eclipse.platform.ui eclipse.platform.ui - 4.8.0-SNAPSHOT + 4.9.0-SNAPSHOT ../../ org.eclipse.e4 org.eclipse.e4.core.commands - 0.12.200-SNAPSHOT + 0.12.300-SNAPSHOT eclipse-plugin diff -pruN 4.8-1/bundles/org.eclipse.e4.core.commands/src/org/eclipse/e4/core/commands/CommandServiceAddon.java 4.9-1/bundles/org.eclipse.e4.core.commands/src/org/eclipse/e4/core/commands/CommandServiceAddon.java --- 4.8-1/bundles/org.eclipse.e4.core.commands/src/org/eclipse/e4/core/commands/CommandServiceAddon.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.commands/src/org/eclipse/e4/core/commands/CommandServiceAddon.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2010, 2016 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.core.commands/src/org/eclipse/e4/core/commands/ECommandService.java 4.9-1/bundles/org.eclipse.e4.core.commands/src/org/eclipse/e4/core/commands/ECommandService.java --- 4.8-1/bundles/org.eclipse.e4.core.commands/src/org/eclipse/e4/core/commands/ECommandService.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.commands/src/org/eclipse/e4/core/commands/ECommandService.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009, 2017 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.core.commands/src/org/eclipse/e4/core/commands/EHandlerService.java 4.9-1/bundles/org.eclipse.e4.core.commands/src/org/eclipse/e4/core/commands/EHandlerService.java --- 4.8-1/bundles/org.eclipse.e4.core.commands/src/org/eclipse/e4/core/commands/EHandlerService.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.commands/src/org/eclipse/e4/core/commands/EHandlerService.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.core.commands/src/org/eclipse/e4/core/commands/ExpressionContext.java 4.9-1/bundles/org.eclipse.e4.core.commands/src/org/eclipse/e4/core/commands/ExpressionContext.java --- 4.8-1/bundles/org.eclipse.e4.core.commands/src/org/eclipse/e4/core/commands/ExpressionContext.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.commands/src/org/eclipse/e4/core/commands/ExpressionContext.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2010, 2014 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.core.commands/src/org/eclipse/e4/core/commands/internal/CommandServiceCreationFunction.java 4.9-1/bundles/org.eclipse.e4.core.commands/src/org/eclipse/e4/core/commands/internal/CommandServiceCreationFunction.java --- 4.8-1/bundles/org.eclipse.e4.core.commands/src/org/eclipse/e4/core/commands/internal/CommandServiceCreationFunction.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.commands/src/org/eclipse/e4/core/commands/internal/CommandServiceCreationFunction.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009, 2014 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.core.commands/src/org/eclipse/e4/core/commands/internal/CommandServiceImpl.java 4.9-1/bundles/org.eclipse.e4.core.commands/src/org/eclipse/e4/core/commands/internal/CommandServiceImpl.java --- 4.8-1/bundles/org.eclipse.e4.core.commands/src/org/eclipse/e4/core/commands/internal/CommandServiceImpl.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.commands/src/org/eclipse/e4/core/commands/internal/CommandServiceImpl.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009, 2017 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.core.commands/src/org/eclipse/e4/core/commands/internal/HandlerServiceCreationFunction.java 4.9-1/bundles/org.eclipse.e4.core.commands/src/org/eclipse/e4/core/commands/internal/HandlerServiceCreationFunction.java --- 4.8-1/bundles/org.eclipse.e4.core.commands/src/org/eclipse/e4/core/commands/internal/HandlerServiceCreationFunction.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.commands/src/org/eclipse/e4/core/commands/internal/HandlerServiceCreationFunction.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.core.commands/src/org/eclipse/e4/core/commands/internal/HandlerServiceHandler.java 4.9-1/bundles/org.eclipse.e4.core.commands/src/org/eclipse/e4/core/commands/internal/HandlerServiceHandler.java --- 4.8-1/bundles/org.eclipse.e4.core.commands/src/org/eclipse/e4/core/commands/internal/HandlerServiceHandler.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.commands/src/org/eclipse/e4/core/commands/internal/HandlerServiceHandler.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2013, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation @@ -23,6 +26,7 @@ import org.eclipse.e4.core.commands.inte import org.eclipse.e4.core.contexts.ContextInjectionFactory; import org.eclipse.e4.core.contexts.EclipseContextFactory; import org.eclipse.e4.core.contexts.IEclipseContext; +import org.eclipse.e4.core.di.InjectionException; import org.eclipse.e4.core.di.annotations.CanExecute; import org.eclipse.e4.core.di.annotations.Execute; @@ -157,6 +161,12 @@ public class HandlerServiceHandler exten new NotHandledException(getClass().getName())); } return result; + } catch (InjectionException e) { + if (e.getCause() instanceof ExecutionException) { + ExecutionException executionException = (ExecutionException) e.getCause(); + throw executionException; + } + throw new ExecutionException("Error invoking " + handler + " in " + staticContext, e); //$NON-NLS-1$ //$NON-NLS-2$ } finally { if (localStaticContext != null) { localStaticContext.dispose(); diff -pruN 4.8-1/bundles/org.eclipse.e4.core.commands/src/org/eclipse/e4/core/commands/internal/HandlerServiceImpl.java 4.9-1/bundles/org.eclipse.e4.core.commands/src/org/eclipse/e4/core/commands/internal/HandlerServiceImpl.java --- 4.8-1/bundles/org.eclipse.e4.core.commands/src/org/eclipse/e4/core/commands/internal/HandlerServiceImpl.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.commands/src/org/eclipse/e4/core/commands/internal/HandlerServiceImpl.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.core.commands/src/org/eclipse/e4/core/commands/internal/ICommandHelpService.java 4.9-1/bundles/org.eclipse.e4.core.commands/src/org/eclipse/e4/core/commands/internal/ICommandHelpService.java --- 4.8-1/bundles/org.eclipse.e4.core.commands/src/org/eclipse/e4/core/commands/internal/ICommandHelpService.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.commands/src/org/eclipse/e4/core/commands/internal/ICommandHelpService.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2014 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.core.commands/src/org/eclipse/e4/core/commands/internal/SetEnabled.java 4.9-1/bundles/org.eclipse.e4.core.commands/src/org/eclipse/e4/core/commands/internal/SetEnabled.java --- 4.8-1/bundles/org.eclipse.e4.core.commands/src/org/eclipse/e4/core/commands/internal/SetEnabled.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.core.commands/src/org/eclipse/e4/core/commands/internal/SetEnabled.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2013, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.emf.xpath/about.html 4.9-1/bundles/org.eclipse.e4.emf.xpath/about.html --- 4.8-1/bundles/org.eclipse.e4.emf.xpath/about.html 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.emf.xpath/about.html 2018-09-06 11:21:18.000000000 +0000 @@ -2,52 +2,35 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + About -

    About This Content

    - -

    November 20, 2008

    -

    License

    +

    About This Content

    -

    The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise -indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at http://www.eclipse.org/legal/epl-v10.html. -For purposes of the EPL, "Program" will mean the Content.

    +

    November 30, 2017

    +

    License

    -

    If you did not receive this Content directly from the Eclipse Foundation, the Content is -being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor's license that was -provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at http://www.eclipse.org.

    - -

    Third Party Content

    - -

    The Content includes items from third parties as set out below. If you did not -receive this Content directly from the Eclipse Foundation, the following is provided for informational -purposes only, and you should look to the Redistributor’s license for terms and conditions of use.

    - - -

    Apache Commons JXPath 1.2.0

    -

    The plug-in includes Apache Commons JXPath 1.2.0 ("Commons JXPath") developed by the Apache Software Foundation as part of the Jakarta project. Therefore:

    - -
    -This product includes software developed by the Apache Software Foundation (http://www.apache.org/). -
    - -

    Commons JXPath is:

    - -
    Copyright (c) 1997-2007 The Apache Software Foundation. All rights reserved.
    - -

    Your use of the Commons JXPath code is subject to the terms and conditions of the Apache Software License 2.0. A copy of the license is contained -in the file LICENSE.txt and is also available at http://www.apache.org/licenses/LICENSE-2.0.html. - -

    The Apache attribution NOTICE.txt file is included with the Content in accordance with 4d of the Apache License, Version 2.0.

    - -

    Examples and documentation as well as updated source code for Commons JXPath is available at http://commons.apache.org/jxpath/.

    +

    + The Eclipse Foundation makes available all content in this plug-in + ("Content"). Unless otherwise indicated below, the Content + is provided to you under the terms and conditions of the Eclipse + Public License Version 2.0 ("EPL"). A copy of the EPL is + available at http://www.eclipse.org/legal/epl-2.0. + For purposes of the EPL, "Program" will mean the Content. +

    + +

    + If you did not receive this Content directly from the Eclipse + Foundation, the Content is being redistributed by another party + ("Redistributor") and different terms and conditions may + apply to your use of any object code in the Content. Check the + Redistributor's license that was provided with the Content. If no such + license exists, contact the Redistributor. Unless otherwise indicated + below, the terms and conditions of the EPL still apply to any source + code in the Content and such source code may be obtained at http://www.eclipse.org. +

    \ No newline at end of file diff -pruN 4.8-1/bundles/org.eclipse.e4.emf.xpath/build.properties 4.9-1/bundles/org.eclipse.e4.emf.xpath/build.properties --- 4.8-1/bundles/org.eclipse.e4.emf.xpath/build.properties 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.emf.xpath/build.properties 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 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 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.emf.xpath/META-INF/MANIFEST.MF 4.9-1/bundles/org.eclipse.e4.emf.xpath/META-INF/MANIFEST.MF --- 4.8-1/bundles/org.eclipse.e4.emf.xpath/META-INF/MANIFEST.MF 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.emf.xpath/META-INF/MANIFEST.MF 2018-09-06 11:21:18.000000000 +0000 @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.e4.emf.xpath -Bundle-Version: 0.2.100.qualifier +Bundle-Version: 0.2.200.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.apache.commons.jxpath;bundle-version="1.2.0", org.eclipse.emf.ecore;bundle-version="2.6.0" diff -pruN 4.8-1/bundles/org.eclipse.e4.emf.xpath/OSGI-INF/l10n/bundle.properties 4.9-1/bundles/org.eclipse.e4.emf.xpath/OSGI-INF/l10n/bundle.properties --- 4.8-1/bundles/org.eclipse.e4.emf.xpath/OSGI-INF/l10n/bundle.properties 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.emf.xpath/OSGI-INF/l10n/bundle.properties 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 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 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.emf.xpath/pom.xml 4.9-1/bundles/org.eclipse.e4.emf.xpath/pom.xml --- 4.8-1/bundles/org.eclipse.e4.emf.xpath/pom.xml 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.emf.xpath/pom.xml 2018-09-06 11:21:18.000000000 +0000 @@ -14,11 +14,11 @@ eclipse.platform.ui eclipse.platform.ui - 4.8.0-SNAPSHOT + 4.9.0-SNAPSHOT ../../ org.eclipse.e4 org.eclipse.e4.emf.xpath - 0.2.100-SNAPSHOT + 0.2.200-SNAPSHOT eclipse-plugin diff -pruN 4.8-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/internal/xpath/CollectionAttributeNodeIterator.java 4.9-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/internal/xpath/CollectionAttributeNodeIterator.java --- 4.8-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/internal/xpath/CollectionAttributeNodeIterator.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/internal/xpath/CollectionAttributeNodeIterator.java 2018-09-06 11:21:18.000000000 +0000 @@ -16,10 +16,13 @@ */ /******************************************************************************* * Copyright (c) 2010 BestSolution.at and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Tom Schindl - adjustment to EObject diff -pruN 4.8-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/internal/xpath/CollectionChildNodeIterator.java 4.9-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/internal/xpath/CollectionChildNodeIterator.java --- 4.8-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/internal/xpath/CollectionChildNodeIterator.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/internal/xpath/CollectionChildNodeIterator.java 2018-09-06 11:21:18.000000000 +0000 @@ -16,10 +16,13 @@ */ /******************************************************************************* * Copyright (c) 2010 BestSolution.at and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Tom Schindl - adjustment to EObject diff -pruN 4.8-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/internal/xpath/CollectionNodeIterator.java 4.9-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/internal/xpath/CollectionNodeIterator.java --- 4.8-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/internal/xpath/CollectionNodeIterator.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/internal/xpath/CollectionNodeIterator.java 2018-09-06 11:21:18.000000000 +0000 @@ -16,10 +16,13 @@ */ /******************************************************************************* * Copyright (c) 2010 BestSolution.at and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Tom Schindl - adjustment to EObject diff -pruN 4.8-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/internal/xpath/CollectionPointer.java 4.9-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/internal/xpath/CollectionPointer.java --- 4.8-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/internal/xpath/CollectionPointer.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/internal/xpath/CollectionPointer.java 2018-09-06 11:21:18.000000000 +0000 @@ -16,10 +16,13 @@ */ /******************************************************************************* * Copyright (c) 2010 BestSolution.at and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Tom Schindl - adjustment to EObject diff -pruN 4.8-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/internal/xpath/EObjectAttributeIterator.java 4.9-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/internal/xpath/EObjectAttributeIterator.java --- 4.8-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/internal/xpath/EObjectAttributeIterator.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/internal/xpath/EObjectAttributeIterator.java 2018-09-06 11:21:18.000000000 +0000 @@ -16,10 +16,13 @@ */ /******************************************************************************* * Copyright (c) 2010 BestSolution.at and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Tom Schindl - adjustment to EObject diff -pruN 4.8-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/internal/xpath/EObjectPointerFactory.java 4.9-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/internal/xpath/EObjectPointerFactory.java --- 4.8-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/internal/xpath/EObjectPointerFactory.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/internal/xpath/EObjectPointerFactory.java 2018-09-06 11:21:18.000000000 +0000 @@ -16,10 +16,13 @@ */ /******************************************************************************* * Copyright (c) 2010 BestSolution.at and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Tom Schindl - adjustment to EObject diff -pruN 4.8-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/internal/xpath/EObjectPointer.java 4.9-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/internal/xpath/EObjectPointer.java --- 4.8-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/internal/xpath/EObjectPointer.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/internal/xpath/EObjectPointer.java 2018-09-06 11:21:18.000000000 +0000 @@ -16,10 +16,13 @@ */ /******************************************************************************* * Copyright (c) 2010 BestSolution.at and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Tom Schindl - adjustment to EObject diff -pruN 4.8-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/internal/xpath/EObjectPropertyPointer.java 4.9-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/internal/xpath/EObjectPropertyPointer.java --- 4.8-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/internal/xpath/EObjectPropertyPointer.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/internal/xpath/EObjectPropertyPointer.java 2018-09-06 11:21:18.000000000 +0000 @@ -16,10 +16,13 @@ */ /******************************************************************************* * Copyright (c) 2010 BestSolution.at and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Tom Schindl - adjustment to EObject diff -pruN 4.8-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/internal/xpath/EStructuralFeatureIterator.java 4.9-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/internal/xpath/EStructuralFeatureIterator.java --- 4.8-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/internal/xpath/EStructuralFeatureIterator.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/internal/xpath/EStructuralFeatureIterator.java 2018-09-06 11:21:18.000000000 +0000 @@ -16,10 +16,13 @@ */ /******************************************************************************* * Copyright (c) 2010 BestSolution.at and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Tom Schindl - adjustment to EObject diff -pruN 4.8-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/internal/xpath/EStructuralFeatureOwnerPointer.java 4.9-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/internal/xpath/EStructuralFeatureOwnerPointer.java --- 4.8-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/internal/xpath/EStructuralFeatureOwnerPointer.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/internal/xpath/EStructuralFeatureOwnerPointer.java 2018-09-06 11:21:18.000000000 +0000 @@ -16,10 +16,13 @@ */ /******************************************************************************* * Copyright (c) 2010 BestSolution.at and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Tom Schindl - adjustment to EObject diff -pruN 4.8-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/internal/xpath/EStructuralFeaturePointer.java 4.9-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/internal/xpath/EStructuralFeaturePointer.java --- 4.8-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/internal/xpath/EStructuralFeaturePointer.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/internal/xpath/EStructuralFeaturePointer.java 2018-09-06 11:21:18.000000000 +0000 @@ -16,10 +16,13 @@ */ /******************************************************************************* * Copyright (c) 2010 BestSolution.at and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Tom Schindl - adjustment to EObject diff -pruN 4.8-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/internal/xpath/helper/JXPathEObjectInfo.java 4.9-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/internal/xpath/helper/JXPathEObjectInfo.java --- 4.8-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/internal/xpath/helper/JXPathEObjectInfo.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/internal/xpath/helper/JXPathEObjectInfo.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2010, 2015 BestSolution.at and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Tom Schindl - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/internal/xpath/helper/ValueUtils.java 4.9-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/internal/xpath/helper/ValueUtils.java --- 4.8-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/internal/xpath/helper/ValueUtils.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/internal/xpath/helper/ValueUtils.java 2018-09-06 11:21:18.000000000 +0000 @@ -16,10 +16,13 @@ */ /******************************************************************************* * Copyright (c) 2010 BestSolution.at and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Tom Schindl - adjustment to EObject diff -pruN 4.8-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/internal/xpath/JXPathContextFactoryImpl.java 4.9-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/internal/xpath/JXPathContextFactoryImpl.java --- 4.8-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/internal/xpath/JXPathContextFactoryImpl.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/internal/xpath/JXPathContextFactoryImpl.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2010, 2015 BestSolution.at and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Tom Schindl - adjustment to EObject diff -pruN 4.8-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/internal/xpath/JXPathContextImpl.java 4.9-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/internal/xpath/JXPathContextImpl.java --- 4.8-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/internal/xpath/JXPathContextImpl.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/internal/xpath/JXPathContextImpl.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2010, 2015 BestSolution.at and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Tom Schindl - adjustment to EObject diff -pruN 4.8-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/internal/xpath/LangAttributePointer.java 4.9-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/internal/xpath/LangAttributePointer.java --- 4.8-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/internal/xpath/LangAttributePointer.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/internal/xpath/LangAttributePointer.java 2018-09-06 11:21:18.000000000 +0000 @@ -16,10 +16,13 @@ */ /******************************************************************************* * Copyright (c) 2010 BestSolution.at and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Tom Schindl - adjustment to EObject diff -pruN 4.8-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/internal/xpath/NullElementPointer.java 4.9-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/internal/xpath/NullElementPointer.java --- 4.8-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/internal/xpath/NullElementPointer.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/internal/xpath/NullElementPointer.java 2018-09-06 11:21:18.000000000 +0000 @@ -16,10 +16,13 @@ */ /******************************************************************************* * Copyright (c) 2010 BestSolution.at and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Tom Schindl - adjustment to EObject diff -pruN 4.8-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/internal/xpath/NullEStructuralFeaturePointer.java 4.9-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/internal/xpath/NullEStructuralFeaturePointer.java --- 4.8-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/internal/xpath/NullEStructuralFeaturePointer.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/internal/xpath/NullEStructuralFeaturePointer.java 2018-09-06 11:21:18.000000000 +0000 @@ -16,10 +16,13 @@ */ /******************************************************************************* * Copyright (c) 2010 BestSolution.at and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Tom Schindl - adjustment to EObject diff -pruN 4.8-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/internal/xpath/NullPointer.java 4.9-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/internal/xpath/NullPointer.java --- 4.8-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/internal/xpath/NullPointer.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/internal/xpath/NullPointer.java 2018-09-06 11:21:18.000000000 +0000 @@ -16,10 +16,13 @@ */ /******************************************************************************* * Copyright (c) 2010 BestSolution.at and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Tom Schindl - adjustment to EObject diff -pruN 4.8-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/xpath/EcoreXPathContextFactory.java 4.9-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/xpath/EcoreXPathContextFactory.java --- 4.8-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/xpath/EcoreXPathContextFactory.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/xpath/EcoreXPathContextFactory.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2010, 2015 BestSolution.at and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Tom Schindl - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/xpath/XPathContextFactory.java 4.9-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/xpath/XPathContextFactory.java --- 4.8-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/xpath/XPathContextFactory.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/xpath/XPathContextFactory.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2010, 2015 BestSolution.at and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Tom Schindl - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/xpath/XPathContext.java 4.9-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/xpath/XPathContext.java --- 4.8-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/xpath/XPathContext.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/xpath/XPathContext.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2010, 2015 BestSolution.at and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Tom Schindl - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.bindings/about.html 4.9-1/bundles/org.eclipse.e4.ui.bindings/about.html --- 4.8-1/bundles/org.eclipse.e4.ui.bindings/about.html 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.bindings/about.html 2018-09-06 11:21:18.000000000 +0000 @@ -2,27 +2,35 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + About -

    About This Content

    - -

    November 20, 2008

    -

    License

    +

    About This Content

    -

    The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise -indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at http://www.eclipse.org/legal/epl-v10.html. -For purposes of the EPL, "Program" will mean the Content.

    +

    November 30, 2017

    +

    License

    -

    If you did not receive this Content directly from the Eclipse Foundation, the Content is -being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor's license that was -provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at http://www.eclipse.org.

    +

    + The Eclipse Foundation makes available all content in this plug-in + ("Content"). Unless otherwise indicated below, the Content + is provided to you under the terms and conditions of the Eclipse + Public License Version 2.0 ("EPL"). A copy of the EPL is + available at http://www.eclipse.org/legal/epl-2.0. + For purposes of the EPL, "Program" will mean the Content. +

    + +

    + If you did not receive this Content directly from the Eclipse + Foundation, the Content is being redistributed by another party + ("Redistributor") and different terms and conditions may + apply to your use of any object code in the Content. Check the + Redistributor's license that was provided with the Content. If no such + license exists, contact the Redistributor. Unless otherwise indicated + below, the terms and conditions of the EPL still apply to any source + code in the Content and such source code may be obtained at http://www.eclipse.org. +

    \ No newline at end of file diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.bindings/build.properties 4.9-1/bundles/org.eclipse.e4.ui.bindings/build.properties --- 4.8-1/bundles/org.eclipse.e4.ui.bindings/build.properties 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.bindings/build.properties 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2013, 2015 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 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.bindings/META-INF/MANIFEST.MF 4.9-1/bundles/org.eclipse.e4.ui.bindings/META-INF/MANIFEST.MF --- 4.8-1/bundles/org.eclipse.e4.ui.bindings/META-INF/MANIFEST.MF 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.bindings/META-INF/MANIFEST.MF 2018-09-06 11:21:18.000000000 +0000 @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.e4.ui.bindings;singleton:=true -Bundle-Version: 0.12.100.qualifier +Bundle-Version: 0.12.200.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.bindings/plugin.properties 4.9-1/bundles/org.eclipse.e4.ui.bindings/plugin.properties --- 4.8-1/bundles/org.eclipse.e4.ui.bindings/plugin.properties 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.bindings/plugin.properties 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2010 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 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.bindings/pom.xml 4.9-1/bundles/org.eclipse.e4.ui.bindings/pom.xml --- 4.8-1/bundles/org.eclipse.e4.ui.bindings/pom.xml 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.bindings/pom.xml 2018-09-06 11:21:18.000000000 +0000 @@ -14,11 +14,11 @@ eclipse.platform.ui eclipse.platform.ui - 4.8.0-SNAPSHOT + 4.9.0-SNAPSHOT ../../ org.eclipse.e4 org.eclipse.e4.ui.bindings - 0.12.100-SNAPSHOT + 0.12.200-SNAPSHOT eclipse-plugin diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/BindingServiceAddon.java 4.9-1/bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/BindingServiceAddon.java --- 4.8-1/bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/BindingServiceAddon.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/BindingServiceAddon.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2013, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/EBindingService.java 4.9-1/bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/EBindingService.java --- 4.8-1/bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/EBindingService.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/EBindingService.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/internal/BindingServiceCreationFunction.java 4.9-1/bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/internal/BindingServiceCreationFunction.java --- 4.8-1/bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/internal/BindingServiceCreationFunction.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/internal/BindingServiceCreationFunction.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009, 2014 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/internal/BindingServiceImpl.java 4.9-1/bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/internal/BindingServiceImpl.java --- 4.8-1/bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/internal/BindingServiceImpl.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/internal/BindingServiceImpl.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009, 2014 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation @@ -34,8 +37,8 @@ import org.eclipse.jface.bindings.keys.P */ public class BindingServiceImpl implements EBindingService { - final static String ACTIVE_CONTEXTS = "activeContexts"; //$NON-NLS-1$ - final static String USER_TYPE = "user"; //$NON-NLS-1$ + static final String ACTIVE_CONTEXTS = "activeContexts"; //$NON-NLS-1$ + static final String USER_TYPE = "user"; //$NON-NLS-1$ @Inject private IEclipseContext context; diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/internal/BindingTable.java 4.9-1/bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/internal/BindingTable.java --- 4.8-1/bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/internal/BindingTable.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/internal/BindingTable.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2010, 2014 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/internal/BindingTableManager.java 4.9-1/bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/internal/BindingTableManager.java --- 4.8-1/bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/internal/BindingTableManager.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/internal/BindingTableManager.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2010, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/internal/ContextSet.java 4.9-1/bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/internal/ContextSet.java --- 4.8-1/bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/internal/ContextSet.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/internal/ContextSet.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2010, 2014 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/internal/KeyAssistDialog.java 4.9-1/bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/internal/KeyAssistDialog.java --- 4.8-1/bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/internal/KeyAssistDialog.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/internal/KeyAssistDialog.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2011, 2017 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/keys/CancelOnModifyListener.java 4.9-1/bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/keys/CancelOnModifyListener.java --- 4.8-1/bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/keys/CancelOnModifyListener.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/keys/CancelOnModifyListener.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2013, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/keys/KeyBindingDispatcher.java 4.9-1/bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/keys/KeyBindingDispatcher.java --- 4.8-1/bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/keys/KeyBindingDispatcher.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/keys/KeyBindingDispatcher.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009, 2017 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/keys/OutOfOrderListener.java 4.9-1/bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/keys/OutOfOrderListener.java --- 4.8-1/bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/keys/OutOfOrderListener.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/keys/OutOfOrderListener.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2013, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/keys/OutOfOrderVerifyListener.java 4.9-1/bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/keys/OutOfOrderVerifyListener.java --- 4.8-1/bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/keys/OutOfOrderVerifyListener.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/keys/OutOfOrderVerifyListener.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2013, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/about.html 4.9-1/bundles/org.eclipse.e4.ui.css.core/about.html --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/about.html 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/about.html 2018-09-06 11:21:18.000000000 +0000 @@ -2,27 +2,35 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + About -

    About This Content

    - -

    November 20, 2008

    -

    License

    +

    About This Content

    -

    The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise -indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at http://www.eclipse.org/legal/epl-v10.html. -For purposes of the EPL, "Program" will mean the Content.

    +

    November 30, 2017

    +

    License

    -

    If you did not receive this Content directly from the Eclipse Foundation, the Content is -being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor's license that was -provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at http://www.eclipse.org.

    +

    + The Eclipse Foundation makes available all content in this plug-in + ("Content"). Unless otherwise indicated below, the Content + is provided to you under the terms and conditions of the Eclipse + Public License Version 2.0 ("EPL"). A copy of the EPL is + available at http://www.eclipse.org/legal/epl-2.0. + For purposes of the EPL, "Program" will mean the Content. +

    + +

    + If you did not receive this Content directly from the Eclipse + Foundation, the Content is being redistributed by another party + ("Redistributor") and different terms and conditions may + apply to your use of any object code in the Content. Check the + Redistributor's license that was provided with the Content. If no such + license exists, contact the Redistributor. Unless otherwise indicated + below, the terms and conditions of the EPL still apply to any source + code in the Content and such source code may be obtained at http://www.eclipse.org. +

    \ No newline at end of file diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/build.properties 4.9-1/bundles/org.eclipse.e4.ui.css.core/build.properties --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/build.properties 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/build.properties 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2010, 2015 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 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/META-INF/MANIFEST.MF 4.9-1/bundles/org.eclipse.e4.ui.css.core/META-INF/MANIFEST.MF --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/META-INF/MANIFEST.MF 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/META-INF/MANIFEST.MF 2018-09-06 11:21:18.000000000 +0000 @@ -4,7 +4,7 @@ Bundle-SymbolicName: org.eclipse.e4.ui.c Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin -Bundle-Version: 0.12.200.qualifier +Bundle-Version: 0.12.300.qualifier Export-Package: org.eclipse.e4.ui.css.core;x-internal:=true, org.eclipse.e4.ui.css.core.css2;x-friends:="org.eclipse.e4.ui.css.swt.theme,org.eclipse.e4.ui.css.swt,org.eclipse.e4.ui.css.jface", org.eclipse.e4.ui.css.core.dom;x-friends:="org.eclipse.e4.ui.css.swt,org.eclipse.ui.views.properties.tabbed", @@ -32,9 +32,7 @@ Export-Package: org.eclipse.e4.ui.css.co org.eclipse.e4.ui.css.core.serializers;x-friends:="org.eclipse.e4.ui.css.swt", org.eclipse.e4.ui.css.core.util.impl.resources;x-friends:="org.eclipse.e4.ui.css.swt.theme,org.eclipse.e4.ui.workbench.swt", org.eclipse.e4.ui.css.core.util.resources;x-friends:="org.eclipse.e4.ui.css.swt,org.eclipse.e4.ui.css.swt.theme,org.eclipse.e4.ui.workbench.swt", - org.eclipse.e4.ui.css.core.utils;x-friends:="org.eclipse.e4.ui.css.swt", - org.eclipse.e4.ui.css.xml.engine;x-internal:=true, - org.eclipse.e4.ui.css.xml.properties.css2;x-friends:="org.eclipse.e4.ui.css.swt" + org.eclipse.e4.ui.css.core.utils;x-friends:="org.eclipse.e4.ui.css.swt" Require-Bundle: org.w3c.css.sac;bundle-version="1.3.0", org.apache.batik.css;bundle-version="[1.9.1,2.0.0)", org.eclipse.equinox.common;bundle-version="[3.5.0,4.0.0)", diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/plugin.properties 4.9-1/bundles/org.eclipse.e4.ui.css.core/plugin.properties --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/plugin.properties 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/plugin.properties 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2010, 2012 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 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/plugin.xml 4.9-1/bundles/org.eclipse.e4.ui.css.core/plugin.xml --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/plugin.xml 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/plugin.xml 2018-09-06 11:21:18.000000000 +0000 @@ -4,5 +4,4 @@ - diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/pom.xml 4.9-1/bundles/org.eclipse.e4.ui.css.core/pom.xml --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/pom.xml 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/pom.xml 2018-09-06 11:21:18.000000000 +0000 @@ -14,11 +14,11 @@ eclipse.platform.ui eclipse.platform.ui - 4.8.0-SNAPSHOT + 4.9.0-SNAPSHOT ../../ org.eclipse.e4 org.eclipse.e4.ui.css.core - 0.12.200-SNAPSHOT + 0.12.300-SNAPSHOT eclipse-plugin diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/schema/org.eclipse.e4.ui.css.core.elementProvider.exsd 4.9-1/bundles/org.eclipse.e4.ui.css.core/schema/org.eclipse.e4.ui.css.core.elementProvider.exsd --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/schema/org.eclipse.e4.ui.css.core.elementProvider.exsd 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/schema/org.eclipse.e4.ui.css.core.elementProvider.exsd 2018-09-06 11:21:18.000000000 +0000 @@ -144,10 +144,13 @@ The supplied element provider must imple Copyright (c) 2008 Angelo Zerr and others.<br> -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 program and the accompanying materials are made +available under the terms of the Eclipse Public License 2.0 which accompanies this distribution, and is available at <a -href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a> +href="https://www.eclipse.org/legal/epl-2.0">https://www.eclipse.org/legal/epl-v20.html</a>/ + +SPDX-License-Identifier: EPL-2.0 diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/schema/org.eclipse.e4.ui.css.core.propertyHandler.exsd 4.9-1/bundles/org.eclipse.e4.ui.css.core/schema/org.eclipse.e4.ui.css.core.propertyHandler.exsd --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/schema/org.eclipse.e4.ui.css.core.propertyHandler.exsd 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/schema/org.eclipse.e4.ui.css.core.propertyHandler.exsd 2018-09-06 11:21:18.000000000 +0000 @@ -163,10 +163,13 @@ Property handlers must implement the < Copyright (c) 2008 - 2012 Angelo Zerr and others.<br> -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 program and the accompanying materials are made +available under the terms of the Eclipse Public License 2.0 which accompanies this distribution, and is available at <a -href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a> +href="https://www.eclipse.org/legal/epl-2.0">https://www.eclipse.org/legal/epl-v20.html</a>/ + +SPDX-License-Identifier: EPL-2.0 diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/css2/CSS2ColorHelper.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/css2/CSS2ColorHelper.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/css2/CSS2ColorHelper.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/css2/CSS2ColorHelper.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/css2/CSS2FontHelper.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/css2/CSS2FontHelper.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/css2/CSS2FontHelper.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/css2/CSS2FontHelper.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/css2/CSS2FontPropertiesHelpers.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/css2/CSS2FontPropertiesHelpers.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/css2/CSS2FontPropertiesHelpers.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/css2/CSS2FontPropertiesHelpers.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/css2/CSS2PrimitiveValueImpl.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/css2/CSS2PrimitiveValueImpl.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/css2/CSS2PrimitiveValueImpl.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/css2/CSS2PrimitiveValueImpl.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2014 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/css2/CSS2RGBColorImpl.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/css2/CSS2RGBColorImpl.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/css2/CSS2RGBColorImpl.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/css2/CSS2RGBColorImpl.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2014 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/css2/CSSBorderPropertiesHelpers.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/css2/CSSBorderPropertiesHelpers.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/css2/CSSBorderPropertiesHelpers.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/css2/CSSBorderPropertiesHelpers.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/ArrayNodeList.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/ArrayNodeList.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/ArrayNodeList.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/ArrayNodeList.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2014 Manumitting Technologies Inc and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Brian de Alwis (MTI) - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/ChildVisibilityAwareElement.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/ChildVisibilityAwareElement.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/ChildVisibilityAwareElement.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/ChildVisibilityAwareElement.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2014 Manumitting Technologies Inc and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Brian de Alwis (MTI) - Performance tweaks (Bug 430829) diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/CSSExtendedProperties.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/CSSExtendedProperties.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/CSSExtendedProperties.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/CSSExtendedProperties.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/CSSProperty.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/CSSProperty.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/CSSProperty.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/CSSProperty.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/CSSPropertyList.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/CSSPropertyList.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/CSSPropertyList.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/CSSPropertyList.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/CSSStylableElement.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/CSSStylableElement.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/CSSStylableElement.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/CSSStylableElement.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/ElementAdapter.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/ElementAdapter.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/ElementAdapter.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/ElementAdapter.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/ExtendedCSSRule.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/ExtendedCSSRule.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/ExtendedCSSRule.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/ExtendedCSSRule.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/ExtendedDocumentCSS.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/ExtendedDocumentCSS.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/ExtendedDocumentCSS.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/ExtendedDocumentCSS.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2018 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/IElementProvider.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/IElementProvider.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/IElementProvider.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/IElementProvider.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/parsers/CSSParserFactory.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/parsers/CSSParserFactory.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/parsers/CSSParserFactory.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/parsers/CSSParserFactory.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/parsers/CSSParser.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/parsers/CSSParser.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/parsers/CSSParser.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/parsers/CSSParser.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/parsers/ICSSParserFactory.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/parsers/ICSSParserFactory.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/parsers/ICSSParserFactory.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/parsers/ICSSParserFactory.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/AbstractCSSPropertyCompositeHandler.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/AbstractCSSPropertyCompositeHandler.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/AbstractCSSPropertyCompositeHandler.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/AbstractCSSPropertyCompositeHandler.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/converters/AbstractCSSValueConverter.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/converters/AbstractCSSValueConverter.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/converters/AbstractCSSValueConverter.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/converters/AbstractCSSValueConverter.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/converters/CSSValueBooleanConverterImpl.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/converters/CSSValueBooleanConverterImpl.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/converters/CSSValueBooleanConverterImpl.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/converters/CSSValueBooleanConverterImpl.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2014 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/converters/CSSValueConverterConfigColorImpl.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/converters/CSSValueConverterConfigColorImpl.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/converters/CSSValueConverterConfigColorImpl.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/converters/CSSValueConverterConfigColorImpl.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/converters/ICSSValueConverterColorConfig.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/converters/ICSSValueConverterColorConfig.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/converters/ICSSValueConverterColorConfig.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/converters/ICSSValueConverterColorConfig.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/converters/ICSSValueConverterConfig.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/converters/ICSSValueConverterConfig.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/converters/ICSSValueConverterConfig.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/converters/ICSSValueConverterConfig.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/converters/ICSSValueConverter.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/converters/ICSSValueConverter.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/converters/ICSSValueConverter.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/converters/ICSSValueConverter.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyBackgroundCompositeHandler.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyBackgroundCompositeHandler.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyBackgroundCompositeHandler.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyBackgroundCompositeHandler.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2014 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyBackgroundHandler.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyBackgroundHandler.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyBackgroundHandler.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyBackgroundHandler.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyBorderCompositeHandler.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyBorderCompositeHandler.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyBorderCompositeHandler.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyBorderCompositeHandler.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2014 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyBorderHandler.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyBorderHandler.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyBorderHandler.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyBorderHandler.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2014 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyClassificationHandler.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyClassificationHandler.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyClassificationHandler.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyClassificationHandler.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2014 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyDimensionHandler.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyDimensionHandler.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyDimensionHandler.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyDimensionHandler.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2014 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyFontCompositeHandler.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyFontCompositeHandler.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyFontCompositeHandler.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyFontCompositeHandler.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2014 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyFontHandler.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyFontHandler.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyFontHandler.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyFontHandler.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2014 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyMarginHandler.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyMarginHandler.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyMarginHandler.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyMarginHandler.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009, 2014 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyPaddingHandler.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyPaddingHandler.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyPaddingHandler.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyPaddingHandler.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009, 2014 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyTextHandler.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyTextHandler.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyTextHandler.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/AbstractCSSPropertyTextHandler.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2014 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/CSS2FontPropertiesImpl.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/CSS2FontPropertiesImpl.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/CSS2FontPropertiesImpl.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/CSS2FontPropertiesImpl.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2014 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/CSS2FontProperties.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/CSS2FontProperties.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/CSS2FontProperties.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/CSS2FontProperties.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/CSS2PaddingPropertiesImpl.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/CSS2PaddingPropertiesImpl.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/CSS2PaddingPropertiesImpl.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/CSS2PaddingPropertiesImpl.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2011, 2014 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/ICSSPropertyBackgroundHandler.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/ICSSPropertyBackgroundHandler.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/ICSSPropertyBackgroundHandler.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/ICSSPropertyBackgroundHandler.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/ICSSPropertyBorderHandler.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/ICSSPropertyBorderHandler.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/ICSSPropertyBorderHandler.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/ICSSPropertyBorderHandler.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2018 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/ICSSPropertyClassificationHandler.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/ICSSPropertyClassificationHandler.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/ICSSPropertyClassificationHandler.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/ICSSPropertyClassificationHandler.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/ICSSPropertyDimensionHandler.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/ICSSPropertyDimensionHandler.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/ICSSPropertyDimensionHandler.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/ICSSPropertyDimensionHandler.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/ICSSPropertyFontHandler.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/ICSSPropertyFontHandler.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/ICSSPropertyFontHandler.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/ICSSPropertyFontHandler.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/ICSSPropertyMarginHandler.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/ICSSPropertyMarginHandler.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/ICSSPropertyMarginHandler.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/ICSSPropertyMarginHandler.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/ICSSPropertyPaddingHandler.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/ICSSPropertyPaddingHandler.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/ICSSPropertyPaddingHandler.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/ICSSPropertyPaddingHandler.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/ICSSPropertyTextHandler.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/ICSSPropertyTextHandler.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/ICSSPropertyTextHandler.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/css2/ICSSPropertyTextHandler.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/CSSBorderProperties.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/CSSBorderProperties.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/CSSBorderProperties.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/CSSBorderProperties.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/Gradient.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/Gradient.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/Gradient.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/Gradient.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/ICSSPropertyCompositeHandler.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/ICSSPropertyCompositeHandler.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/ICSSPropertyCompositeHandler.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/ICSSPropertyCompositeHandler.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/ICSSPropertyHandler2Delegate.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/ICSSPropertyHandler2Delegate.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/ICSSPropertyHandler2Delegate.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/ICSSPropertyHandler2Delegate.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/ICSSPropertyHandler2.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/ICSSPropertyHandler2.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/ICSSPropertyHandler2.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/ICSSPropertyHandler2.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/ICSSPropertyHandler.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/ICSSPropertyHandler.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/ICSSPropertyHandler.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/ICSSPropertyHandler.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2016 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/ICSSPropertyHandlerProvider.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/ICSSPropertyHandlerProvider.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/ICSSPropertyHandlerProvider.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/ICSSPropertyHandlerProvider.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/providers/AbstractCSSPropertyHandlerProvider.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/providers/AbstractCSSPropertyHandlerProvider.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/providers/AbstractCSSPropertyHandlerProvider.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/providers/AbstractCSSPropertyHandlerProvider.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/providers/CSSPropertyHandlerLazyProviderImpl.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/providers/CSSPropertyHandlerLazyProviderImpl.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/providers/CSSPropertyHandlerLazyProviderImpl.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/providers/CSSPropertyHandlerLazyProviderImpl.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2018 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/providers/CSSPropertyHandlerSimpleProviderImpl.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/providers/CSSPropertyHandlerSimpleProviderImpl.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/providers/CSSPropertyHandlerSimpleProviderImpl.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/dom/properties/providers/CSSPropertyHandlerSimpleProviderImpl.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/engine/CSSElementContext.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/engine/CSSElementContext.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/engine/CSSElementContext.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/engine/CSSElementContext.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/engine/CSSEngine.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/engine/CSSEngine.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/engine/CSSEngine.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/engine/CSSEngine.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2018 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/engine/CSSErrorHandler.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/engine/CSSErrorHandler.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/engine/CSSErrorHandler.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/engine/CSSErrorHandler.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/exceptions/DOMExceptionImpl.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/exceptions/DOMExceptionImpl.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/exceptions/DOMExceptionImpl.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/exceptions/DOMExceptionImpl.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation\ diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/exceptions/ExceptionResource.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/exceptions/ExceptionResource.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/exceptions/ExceptionResource.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/exceptions/ExceptionResource.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2014 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/exceptions/UnsupportedClassCSSPropertyException.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/exceptions/UnsupportedClassCSSPropertyException.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/exceptions/UnsupportedClassCSSPropertyException.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/exceptions/UnsupportedClassCSSPropertyException.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/exceptions/UnsupportedPropertyException.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/exceptions/UnsupportedPropertyException.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/exceptions/UnsupportedPropertyException.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/exceptions/UnsupportedPropertyException.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2014 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/AbstractCSSNode.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/AbstractCSSNode.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/AbstractCSSNode.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/AbstractCSSNode.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/CounterImpl.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/CounterImpl.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/CounterImpl.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/CounterImpl.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2014 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/CSS2PropertiesImpl.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/CSS2PropertiesImpl.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/CSS2PropertiesImpl.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/CSS2PropertiesImpl.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/CSSComputedStyleImpl.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/CSSComputedStyleImpl.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/CSSComputedStyleImpl.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/CSSComputedStyleImpl.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/CSSExtendedPropertiesImpl.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/CSSExtendedPropertiesImpl.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/CSSExtendedPropertiesImpl.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/CSSExtendedPropertiesImpl.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/CSSFontFaceRuleImpl.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/CSSFontFaceRuleImpl.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/CSSFontFaceRuleImpl.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/CSSFontFaceRuleImpl.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2014 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/CSSImportRuleImpl.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/CSSImportRuleImpl.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/CSSImportRuleImpl.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/CSSImportRuleImpl.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/CSSMediaRuleImpl.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/CSSMediaRuleImpl.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/CSSMediaRuleImpl.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/CSSMediaRuleImpl.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/CSSPageRuleImpl.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/CSSPageRuleImpl.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/CSSPageRuleImpl.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/CSSPageRuleImpl.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/CSSPropertyImpl.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/CSSPropertyImpl.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/CSSPropertyImpl.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/CSSPropertyImpl.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2014 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/CSSPropertyListImpl.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/CSSPropertyListImpl.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/CSSPropertyListImpl.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/CSSPropertyListImpl.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/CSSRuleImpl.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/CSSRuleImpl.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/CSSRuleImpl.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/CSSRuleImpl.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/CSSRuleListImpl.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/CSSRuleListImpl.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/CSSRuleListImpl.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/CSSRuleListImpl.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/CSSStyleDeclarationImpl.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/CSSStyleDeclarationImpl.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/CSSStyleDeclarationImpl.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/CSSStyleDeclarationImpl.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2016 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/CSSStyleRuleImpl.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/CSSStyleRuleImpl.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/CSSStyleRuleImpl.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/CSSStyleRuleImpl.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/CSSStyleSheetImpl.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/CSSStyleSheetImpl.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/CSSStyleSheetImpl.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/CSSStyleSheetImpl.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/CSSUnknownRuleImpl.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/CSSUnknownRuleImpl.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/CSSUnknownRuleImpl.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/CSSUnknownRuleImpl.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/CSSValueFactory.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/CSSValueFactory.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/CSSValueFactory.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/CSSValueFactory.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/CSSValueImpl.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/CSSValueImpl.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/CSSValueImpl.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/CSSValueImpl.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/CSSValueListImpl.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/CSSValueListImpl.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/CSSValueListImpl.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/CSSValueListImpl.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/DocumentCSSImpl.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/DocumentCSSImpl.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/DocumentCSSImpl.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/DocumentCSSImpl.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2018 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/Measure.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/Measure.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/Measure.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/Measure.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/MediaListImpl.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/MediaListImpl.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/MediaListImpl.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/MediaListImpl.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation] diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/parsers/AbstractCSSParser.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/parsers/AbstractCSSParser.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/parsers/AbstractCSSParser.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/parsers/AbstractCSSParser.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/parsers/CSSParserFactoryImpl.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/parsers/CSSParserFactoryImpl.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/parsers/CSSParserFactoryImpl.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/parsers/CSSParserFactoryImpl.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/parsers/CSSParserImpl.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/parsers/CSSParserImpl.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/parsers/CSSParserImpl.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/parsers/CSSParserImpl.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/properties/CSSBorderPropertiesImpl.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/properties/CSSBorderPropertiesImpl.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/properties/CSSBorderPropertiesImpl.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/properties/CSSBorderPropertiesImpl.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2014 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/RectImpl.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/RectImpl.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/RectImpl.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/RectImpl.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2014 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/RGBColorImpl.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/RGBColorImpl.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/RGBColorImpl.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/RGBColorImpl.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/StyleSheetListImpl.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/StyleSheetListImpl.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/StyleSheetListImpl.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/StyleSheetListImpl.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/StyleWrapper.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/StyleWrapper.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/StyleWrapper.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/StyleWrapper.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,8 +1,11 @@ /******************************************************************************* - * Copyright (c) 2009, 2014 EclipseSource and others. All rights reserved. + * Copyright (c) 2009, 2014 EclipseSource and others. + * * 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 + * terms of the Eclipse Public License 2.0 which accompanies this distribution, +t https://www.eclipse.org/legal/epl-2.0/ +t +t SPDX-License-Identifier: EPL-2.0 * * Contributors: * EclipseSource - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/ViewCSSImpl.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/ViewCSSImpl.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/ViewCSSImpl.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/ViewCSSImpl.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2018 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/engine/AbstractCSSEngine.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/engine/AbstractCSSEngine.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/engine/AbstractCSSEngine.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/engine/AbstractCSSEngine.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation @@ -104,7 +107,7 @@ public abstract class AbstractCSSEngine * Default {@link IResourcesLocatorManager} used to get InputStream, Reader * resource like Image. */ - private final static IResourcesLocatorManager defaultResourcesLocatorManager = ResourcesLocatorManager.INSTANCE; + private static final IResourcesLocatorManager defaultResourcesLocatorManager = ResourcesLocatorManager.INSTANCE; /** * w3c {@link DocumentCSS}. diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/engine/CSSElementContextImpl.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/engine/CSSElementContextImpl.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/engine/CSSElementContextImpl.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/engine/CSSElementContextImpl.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/engine/CSSEngineImpl.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/engine/CSSEngineImpl.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/engine/CSSEngineImpl.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/engine/CSSEngineImpl.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/engine/CSSErrorHandlerImpl.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/engine/CSSErrorHandlerImpl.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/engine/CSSErrorHandlerImpl.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/engine/CSSErrorHandlerImpl.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/engine/RegistryCSSElementProvider.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/engine/RegistryCSSElementProvider.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/engine/RegistryCSSElementProvider.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/engine/RegistryCSSElementProvider.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2014 Manumitting Technologies Inc and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Brian de Alwis (MTI) - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/engine/RegistryCSSPropertyHandlerProvider.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/engine/RegistryCSSPropertyHandlerProvider.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/engine/RegistryCSSPropertyHandlerProvider.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/engine/RegistryCSSPropertyHandlerProvider.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,13 +1,17 @@ /******************************************************************************* - * Copyright (c) 2012, 2015 Brian de Alwis and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * Copyright (c) 2012, 2018 Brian de Alwis and others. + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Brian de Alwis - cobbled together from other sources * Angelo Zerr - likely source of initial implementation + * Lars Vogel - Ongoing maintenance *******************************************************************************/ package org.eclipse.e4.ui.css.core.impl.engine; @@ -34,8 +38,8 @@ import org.eclipse.e4.ui.css.core.engine import org.w3c.dom.css.CSSStyleDeclaration; import org.w3c.dom.css.CSSValue; -public class RegistryCSSPropertyHandlerProvider extends - AbstractCSSPropertyHandlerProvider { +public class RegistryCSSPropertyHandlerProvider extends AbstractCSSPropertyHandlerProvider { + private static final String ATTR_COMPOSITE = "composite"; private static final String ATTR_ADAPTER = "adapter"; private static final String ATTR_NAME = "name"; @@ -49,28 +53,19 @@ public class RegistryCSSPropertyHandlerP private static final String DEPRECATED_PROPERTY_HANDLERS_EXTPOINT = "org.eclipse.e4.ui.css.swt.property.handler"; private IExtensionRegistry registry; - private boolean hasDeprecatedProperties = false; // mild optimization for - // getCSSProperties() + private boolean hasDeprecatedProperties = false; // mild optimization for getCSSProperties() private Map> propertyHandlerMap = new HashMap<>();; public RegistryCSSPropertyHandlerProvider(IExtensionRegistry registry) { this.registry = registry; if (configure(DEPRECATED_PROPERTY_HANDLERS_EXTPOINT)) { - System.err.println("Extension point " - + DEPRECATED_PROPERTY_HANDLERS_EXTPOINT + System.err.println("Extension point " + DEPRECATED_PROPERTY_HANDLERS_EXTPOINT + " is deprecated; use " + PROPERTY_HANDLERS_EXTPOINT); } configure(PROPERTY_HANDLERS_EXTPOINT); } - public RegistryCSSPropertyHandlerProvider(IExtensionRegistry registry, - String extensionPointId) { - this.registry = registry; - // FIXME: should install a registry listener to make this dynamic - configure(extensionPointId); - } - /** @return true if some extensions were found */ protected boolean configure(String extensionPointId) { IExtensionPoint extPoint = registry.getExtensionPoint(extensionPointId); @@ -84,53 +79,8 @@ public class RegistryCSSPropertyHandlerP Map> handlersMap = new HashMap<>(); for (IExtension e : extensions) { for (IConfigurationElement ce : e.getConfigurationElements()) { - if (ce.getName().equals(ATTR_HANDLER)) { - // a single handler may implement a number of properties - String name = ce.getAttribute(ATTR_COMPOSITE); - String adapter = ce.getAttribute(ATTR_ADAPTER); - // if (className.equals(adapter)) { - IConfigurationElement[] children = ce.getChildren(); - String[] names = new String[children.length]; - String[] deprecated = new String[children.length]; - for (int i = 0; i < children.length; i++) { - if (children[i].getName().equals(ATTR_PROPERTY_NAME)) { - names[i] = children[i].getAttribute(ATTR_NAME); - deprecated[i] = children[i] - .getAttribute(ATTR_DEPRECATED); - if (deprecated[i] != null) { - hasDeprecatedProperties = true; - } - } - - } - try { - Map adaptersMap = handlersMap - .get(adapter); - if (adaptersMap == null) { - handlersMap - .put(adapter, - adaptersMap = new HashMap<>()); - } - if (!adaptersMap.containsKey(name)) { - Object t = ce - .createExecutableExtension(ATTR_HANDLER); - if (t instanceof ICSSPropertyHandler) { - for (int i = 0; i < names.length; i++) { - adaptersMap - .put(names[i], - deprecated[i] == null ? (ICSSPropertyHandler) t - : new DeprecatedPropertyHandlerWrapper( - (ICSSPropertyHandler) t, - deprecated[i])); - } - } else { - logError("invalid property handler for " + name); - } - } - } catch (CoreException e1) { - logError("invalid property handler for " + name + ": " - + e1); - } + if (ATTR_HANDLER.equals(ce.getName())) { + registerPropertyHandler(handlersMap, ce); } } } @@ -138,12 +88,53 @@ public class RegistryCSSPropertyHandlerP return true; } + private void registerPropertyHandler(Map> handlersMap, + IConfigurationElement ce) { + // a single handler may implement a number of properties + String name = ce.getAttribute(ATTR_COMPOSITE); + String adapter = ce.getAttribute(ATTR_ADAPTER); + IConfigurationElement[] children = ce.getChildren(); + String[] names = new String[children.length]; + String[] deprecated = new String[children.length]; + for (int i = 0; i < children.length; i++) { + if (children[i].getName().equals(ATTR_PROPERTY_NAME)) { + names[i] = children[i].getAttribute(ATTR_NAME); + deprecated[i] = children[i].getAttribute(ATTR_DEPRECATED); + if (deprecated[i] != null) { + hasDeprecatedProperties = true; + } + } + + } + try { + Map adaptersMap = handlersMap.get(adapter); + if (adaptersMap == null) { + handlersMap.put(adapter, adaptersMap = new HashMap<>()); + } + if (!adaptersMap.containsKey(name)) { + Object t = ce.createExecutableExtension(ATTR_HANDLER); + if (t instanceof ICSSPropertyHandler) { + for (int i = 0; i < names.length; i++) { + adaptersMap.put(names[i], + deprecated[i] == null ? (ICSSPropertyHandler) t + : new DeprecatedPropertyHandlerWrapper( + (ICSSPropertyHandler) t, + deprecated[i])); + } + } else { + logError("invalid property handler for " + name); + } + } + } catch (CoreException e1) { + logError("invalid property handler for " + name + ": " + + e1); + } + } + @Override - public Collection getCSSPropertyHandlers( - String property) throws Exception { + public Collection getCSSPropertyHandlers(String property) throws Exception { List handlers = new ArrayList<>(); - for (Map perElement : propertyHandlerMap - .values()) { + for (Map perElement : propertyHandlerMap.values()) { ICSSPropertyHandler h = perElement.get(property); if (h != null) { handlers.add(h); @@ -156,41 +147,39 @@ public class RegistryCSSPropertyHandlerP protected CSSStyleDeclaration getDefaultCSSStyleDeclaration( CSSEngine engine, CSSStylableElement stylableElement, CSSStyleDeclaration newStyle, String pseudoE) throws Exception { - if (stylableElement.getDefaultStyleDeclaration(pseudoE) != null) + if (stylableElement.getDefaultStyleDeclaration(pseudoE) != null) { return stylableElement.getDefaultStyleDeclaration(pseudoE); + } if (newStyle != null) { - StringBuilder style = null; + StringBuilder builder = null; int length = newStyle.getLength(); for (int i = 0; i < length; i++) { String propertyName = newStyle.item(i); - String[] compositePropertiesNames = engine - .getCSSCompositePropertiesNames(propertyName); + String[] compositePropertiesNames = engine.getCSSCompositePropertiesNames(propertyName); if (compositePropertiesNames != null) { for (String compositePropertyName : compositePropertiesNames) { propertyName = compositePropertyName; - String s = getCSSPropertyStyle(engine, stylableElement, - propertyName, pseudoE); + String s = getCSSPropertyStyle(engine, stylableElement, propertyName, pseudoE); if (s != null) { - if (style == null) - style = new StringBuilder(); - style.append(s); + if (builder == null) { + builder = new StringBuilder(); + } + builder.append(s); } } } else { - String s = getCSSPropertyStyle(engine, stylableElement, - propertyName, pseudoE); + String s = getCSSPropertyStyle(engine, stylableElement, propertyName, pseudoE); if (s != null) { - if (style == null) - style = new StringBuilder(); - style.append(s); + if (builder == null) { + builder = new StringBuilder(); + } + builder.append(s); } } } - if (style != null) { - CSSStyleDeclaration defaultStyleDeclaration = engine - .parseStyleDeclaration(style.toString()); - stylableElement.setDefaultStyleDeclaration(pseudoE, - defaultStyleDeclaration); + if (builder != null) { + CSSStyleDeclaration defaultStyleDeclaration = engine.parseStyleDeclaration(builder.toString()); + stylableElement.setDefaultStyleDeclaration(pseudoE, defaultStyleDeclaration); return defaultStyleDeclaration; } } @@ -198,14 +187,12 @@ public class RegistryCSSPropertyHandlerP } @Override - public Collection getCSSPropertyHandlers( - Object element, String property) throws Exception { + public Collection getCSSPropertyHandlers(Object element, String property) throws Exception { List handlers = new ArrayList<>(); Class clazz = element.getClass(); while (clazz != Object.class) { if (propertyHandlerMap.containsKey(clazz.getName())) { - ICSSPropertyHandler handler = propertyHandlerMap.get( - clazz.getName()).get(property); + ICSSPropertyHandler handler = propertyHandlerMap.get(clazz.getName()).get(property); if (handler != null) { handlers.add(handler); } @@ -221,14 +208,12 @@ public class RegistryCSSPropertyHandlerP Set properties = new HashSet<>(); Class clazz = element.getClass(); while (clazz != Object.class) { - Map handlerMap = propertyHandlerMap - .get(clazz.getName()); + Map handlerMap = propertyHandlerMap.get(clazz.getName()); if (handlerMap != null) { if (!hasDeprecatedProperties) { properties.addAll(handlerMap.keySet()); } else { - for (Entry entry : handlerMap - .entrySet()) { + for (Entry entry : handlerMap.entrySet()) { if (!(entry.getValue() instanceof DeprecatedPropertyHandlerWrapper)) { properties.add(entry.getKey()); } @@ -242,44 +227,37 @@ public class RegistryCSSPropertyHandlerP protected void logError(String message) { // we log as an error to ensure it's shown - RuntimeLog.log(new Status(IStatus.ERROR, "org.eclipse.e4.ui.css.core", - message)); + RuntimeLog.log(new Status(IStatus.ERROR, "org.eclipse.e4.ui.css.core", message)); } - private class DeprecatedPropertyHandlerWrapper implements - ICSSPropertyHandler { + private class DeprecatedPropertyHandlerWrapper implements ICSSPropertyHandler { private ICSSPropertyHandler delegate; private String message; private Set logged = new HashSet<>(); - DeprecatedPropertyHandlerWrapper(ICSSPropertyHandler handler, - String message) { + DeprecatedPropertyHandlerWrapper(ICSSPropertyHandler handler, String message) { delegate = handler; this.message = message; } @Override - public boolean applyCSSProperty(Object element, String property, - CSSValue value, String pseudo, CSSEngine engine) - throws Exception { + public boolean applyCSSProperty(Object element, String property, CSSValue value, String pseudo, + CSSEngine engine) throws Exception { logIfNecessary(property); - return delegate.applyCSSProperty(element, property, value, pseudo, - engine); + return delegate.applyCSSProperty(element, property, value, pseudo, engine); } @Override - public String retrieveCSSProperty(Object element, String property, - String pseudo, CSSEngine engine) throws Exception { + public String retrieveCSSProperty(Object element, String property, String pseudo, CSSEngine engine) + throws Exception { logIfNecessary(property); - return delegate.retrieveCSSProperty(element, property, pseudo, - engine); + return delegate.retrieveCSSProperty(element, property, pseudo, engine); } private void logIfNecessary(String property) { if (!logged.contains(property)) { logged.add(property); - logError("CSS property '" + property - + "' has been deprecated: " + message); + logError("CSS property '" + property + "' has been deprecated: " + message); } } } diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/sac/CSSDocumentHandlerImpl.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/sac/CSSDocumentHandlerImpl.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/sac/CSSDocumentHandlerImpl.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/sac/CSSDocumentHandlerImpl.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,22 +1,15 @@ /******************************************************************************* * Copyright (c) 2015 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 - * http://www.eclipse.org/legal/epl-v10.html * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -/******************************************************************************* - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation - * IBM Corporation - ongoing development *******************************************************************************/ package org.eclipse.e4.ui.css.core.impl.sac; diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/sac/DocumentHandlerFactoryImpl.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/sac/DocumentHandlerFactoryImpl.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/sac/DocumentHandlerFactoryImpl.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/sac/DocumentHandlerFactoryImpl.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/sac/SACParserFactoryImpl.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/sac/SACParserFactoryImpl.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/sac/SACParserFactoryImpl.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/sac/SACParserFactoryImpl.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/resources/AbstractResourcesRegistry.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/resources/AbstractResourcesRegistry.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/resources/AbstractResourcesRegistry.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/resources/AbstractResourcesRegistry.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/resources/CSSResourcesHelpers.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/resources/CSSResourcesHelpers.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/resources/CSSResourcesHelpers.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/resources/CSSResourcesHelpers.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 20156Angelo 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/resources/IResourcesRegistry.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/resources/IResourcesRegistry.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/resources/IResourcesRegistry.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/resources/IResourcesRegistry.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/resources/ResourceRegistryKeyFactory.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/resources/ResourceRegistryKeyFactory.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/resources/ResourceRegistryKeyFactory.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/resources/ResourceRegistryKeyFactory.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/sac/DocumentHandlerFactory.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/sac/DocumentHandlerFactory.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/sac/DocumentHandlerFactory.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/sac/DocumentHandlerFactory.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/sac/ExtendedDocumentHandler.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/sac/ExtendedDocumentHandler.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/sac/ExtendedDocumentHandler.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/sac/ExtendedDocumentHandler.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/sac/IDocumentHandlerFactory.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/sac/IDocumentHandlerFactory.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/sac/IDocumentHandlerFactory.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/sac/IDocumentHandlerFactory.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/sac/ISACParserFactory.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/sac/ISACParserFactory.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/sac/ISACParserFactory.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/sac/ISACParserFactory.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/sac/ParserNotFoundException.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/sac/ParserNotFoundException.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/sac/ParserNotFoundException.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/sac/ParserNotFoundException.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/sac/SACParserFactory.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/sac/SACParserFactory.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/sac/SACParserFactory.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/sac/SACParserFactory.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2014 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/SACConstants.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/SACConstants.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/SACConstants.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/SACConstants.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/serializers/CSSHTMLSerializerConfiguration.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/serializers/CSSHTMLSerializerConfiguration.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/serializers/CSSHTMLSerializerConfiguration.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/serializers/CSSHTMLSerializerConfiguration.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/serializers/CSSSerializerConfiguration.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/serializers/CSSSerializerConfiguration.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/serializers/CSSSerializerConfiguration.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/serializers/CSSSerializerConfiguration.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/serializers/CSSSerializer.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/serializers/CSSSerializer.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/serializers/CSSSerializer.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/serializers/CSSSerializer.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/util/impl/resources/FileResourcesLocatorImpl.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/util/impl/resources/FileResourcesLocatorImpl.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/util/impl/resources/FileResourcesLocatorImpl.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/util/impl/resources/FileResourcesLocatorImpl.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2014 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/util/impl/resources/HttpResourcesLocatorImpl.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/util/impl/resources/HttpResourcesLocatorImpl.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/util/impl/resources/HttpResourcesLocatorImpl.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/util/impl/resources/HttpResourcesLocatorImpl.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2014 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/util/impl/resources/OSGiResourceLocator.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/util/impl/resources/OSGiResourceLocator.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/util/impl/resources/OSGiResourceLocator.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/util/impl/resources/OSGiResourceLocator.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009, 2014 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/util/impl/resources/ResourcesLocatorManager.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/util/impl/resources/ResourcesLocatorManager.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/util/impl/resources/ResourcesLocatorManager.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/util/impl/resources/ResourcesLocatorManager.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/util/resources/IResourceLocator.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/util/resources/IResourceLocator.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/util/resources/IResourceLocator.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/util/resources/IResourceLocator.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/util/resources/IResourcesLocatorManager.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/util/resources/IResourcesLocatorManager.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/util/resources/IResourcesLocatorManager.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/util/resources/IResourcesLocatorManager.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/util/resources/IURIResolver.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/util/resources/IURIResolver.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/util/resources/IURIResolver.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/util/resources/IURIResolver.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/utils/ClassUtils.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/utils/ClassUtils.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/utils/ClassUtils.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/utils/ClassUtils.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2014 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/utils/StringUtils.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/utils/StringUtils.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/utils/StringUtils.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/utils/StringUtils.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/xml/engine/CSSXMLEngineImpl.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/xml/engine/CSSXMLEngineImpl.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/xml/engine/CSSXMLEngineImpl.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/xml/engine/CSSXMLEngineImpl.java 1970-01-01 00:00:00.000000000 +0000 @@ -1,43 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2008, 2014 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 - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Angelo Zerr - initial API and implementation - *******************************************************************************/ -package org.eclipse.e4.ui.css.xml.engine; - -import org.eclipse.e4.ui.css.core.dom.properties.css2.ICSSPropertyBackgroundHandler; -import org.eclipse.e4.ui.css.core.dom.properties.css2.ICSSPropertyFontHandler; -import org.eclipse.e4.ui.css.core.dom.properties.css2.ICSSPropertyTextHandler; -import org.eclipse.e4.ui.css.core.engine.CSSEngine; -import org.eclipse.e4.ui.css.core.impl.engine.CSSEngineImpl; -import org.eclipse.e4.ui.css.xml.properties.css2.CSSPropertyBackgroundXMLHandler; -import org.eclipse.e4.ui.css.xml.properties.css2.CSSPropertyFontXMLHandler; -import org.eclipse.e4.ui.css.xml.properties.css2.CSSPropertyTextXMLHandler; - -/** - * {@link CSSEngine} implementation to apply style sheet to XML DOM. - */ -public class CSSXMLEngineImpl extends CSSEngineImpl { - - public CSSXMLEngineImpl() { - // Register XML CSS Property Background Handler - super.registerCSSPropertyHandler(ICSSPropertyBackgroundHandler.class, - CSSPropertyBackgroundXMLHandler.INSTANCE); - // Register XML CSS Property Text Handler - super.registerCSSPropertyHandler(ICSSPropertyTextHandler.class, - CSSPropertyTextXMLHandler.INSTANCE); - // Register XML CSS Property Font Handler - super.registerCSSPropertyHandler(ICSSPropertyFontHandler.class, - CSSPropertyFontXMLHandler.INSTANCE); - } - - @Override - public void reapply() { - // TODO Auto-generated method stub - } -} diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/xml/properties/css2/CSSPropertyBackgroundXMLHandler.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/xml/properties/css2/CSSPropertyBackgroundXMLHandler.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/xml/properties/css2/CSSPropertyBackgroundXMLHandler.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/xml/properties/css2/CSSPropertyBackgroundXMLHandler.java 1970-01-01 00:00:00.000000000 +0000 @@ -1,74 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2008 -2014 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 - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Angelo Zerr - initial API and implementation - * Lars Vogel - Bug 422702 - *******************************************************************************/ -package org.eclipse.e4.ui.css.xml.properties.css2; - -import org.eclipse.e4.ui.css.core.dom.properties.css2.AbstractCSSPropertyBackgroundHandler; -import org.eclipse.e4.ui.css.core.dom.properties.css2.ICSSPropertyBackgroundHandler; -import org.eclipse.e4.ui.css.core.engine.CSSEngine; -import org.w3c.dom.Element; -import org.w3c.dom.css.CSSValue; - -/** - * - */ -public class CSSPropertyBackgroundXMLHandler extends -AbstractCSSPropertyBackgroundHandler { - - public final static ICSSPropertyBackgroundHandler INSTANCE = new CSSPropertyBackgroundXMLHandler(); - - @Override - public boolean applyCSSProperty(Object node, String property, - CSSValue value, String pseudo, CSSEngine engine) throws Exception { - if (node instanceof Element) { - super.applyCSSProperty(node, property, value, pseudo, - engine); - return true; - } - return false; - } - - @Override - public String retrieveCSSPropertyBackgroundAttachment(Object element, - String pseudo, CSSEngine engine) throws Exception { - // TODO Auto-generated method stub - return null; - } - - @Override - public String retrieveCSSPropertyBackgroundColor(Object element, - String pseudo, CSSEngine engine) throws Exception { - // TODO Auto-generated method stub - return null; - } - - @Override - public String retrieveCSSPropertyBackgroundImage(Object element, - String pseudo, CSSEngine engine) throws Exception { - // TODO Auto-generated method stub - return null; - } - - @Override - public String retrieveCSSPropertyBackgroundPosition(Object element, - String pseudo, CSSEngine engine) throws Exception { - // TODO Auto-generated method stub - return null; - } - - @Override - public String retrieveCSSPropertyBackgroundRepeat(Object element, - String pseudo, CSSEngine engine) throws Exception { - // TODO Auto-generated method stub - return null; - } - -} diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/xml/properties/css2/CSSPropertyFontXMLHandler.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/xml/properties/css2/CSSPropertyFontXMLHandler.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/xml/properties/css2/CSSPropertyFontXMLHandler.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/xml/properties/css2/CSSPropertyFontXMLHandler.java 1970-01-01 00:00:00.000000000 +0000 @@ -1,137 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2008 - 2014 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 - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Angelo Zerr - initial API and implementation - * Lars Vogel - Bug 422702 - *******************************************************************************/ -package org.eclipse.e4.ui.css.xml.properties.css2; - -import org.eclipse.e4.ui.css.core.dom.properties.css2.AbstractCSSPropertyFontHandler; -import org.eclipse.e4.ui.css.core.dom.properties.css2.ICSSPropertyFontHandler; -import org.eclipse.e4.ui.css.core.engine.CSSEngine; -import org.w3c.dom.Element; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; -import org.w3c.dom.css.CSSPrimitiveValue; -import org.w3c.dom.css.CSSValue; - -/** - * - */ -public class CSSPropertyFontXMLHandler extends AbstractCSSPropertyFontHandler { - - public final static ICSSPropertyFontHandler INSTANCE = new CSSPropertyFontXMLHandler(); - - @Override - public boolean applyCSSProperty(Object node, String property, - CSSValue value, String pseudo, CSSEngine engine) throws Exception { - if (node instanceof Element && ((Node) node).getOwnerDocument() != null) { - super.applyCSSProperty(node, property, value, pseudo, - engine); - return true; - } - return false; - } - - @Override - public void applyCSSPropertyFontSize(Object node, CSSValue value, - String pseudo, CSSEngine engine) throws Exception { - if (value.getCssValueType() == CSSValue.CSS_PRIMITIVE_VALUE) { - Element element = (Element) node; - // Add size attribute - int size = (int) ((CSSPrimitiveValue) value) - .getFloatValue(CSSPrimitiveValue.CSS_PT); - element.setAttribute("size", size + ""); - } - } - - @Override - public void applyCSSPropertyFontWeight(Object node, CSSValue value, - String pseudo, CSSEngine engine) throws Exception { - if (value.getCssValueType() == CSSValue.CSS_PRIMITIVE_VALUE) { - Element element = (Element) node; - String weight = ((CSSPrimitiveValue) value).getStringValue(); - if ("bold".equals(weight.toLowerCase())) { - insertElement(element, "b"); - } - } - } - - @Override - public void applyCSSPropertyFontStyle(Object node, CSSValue value, - String pseudo, CSSEngine engine) throws Exception { - if (value.getCssValueType() == CSSValue.CSS_PRIMITIVE_VALUE) { - Element element = (Element) node; - String style = ((CSSPrimitiveValue) value).getStringValue(); - if ("italic".equals(style)) { - insertElement(element, "i"); - } - } - } - - @Override - public String retrieveCSSPropertyFontAdjust(Object element, String pseudo, - CSSEngine engine) throws Exception { - // TODO Auto-generated method stub - return null; - } - - @Override - public String retrieveCSSPropertyFontFamily(Object element, String pseudo, - CSSEngine engine) throws Exception { - // TODO Auto-generated method stub - return null; - } - - @Override - public String retrieveCSSPropertyFontSize(Object element, String pseudo, - CSSEngine engine) throws Exception { - // TODO Auto-generated method stub - return null; - } - - @Override - public String retrieveCSSPropertyFontStretch(Object element, String pseudo, - CSSEngine engine) throws Exception { - // TODO Auto-generated method stub - return null; - } - - @Override - public String retrieveCSSPropertyFontStyle(Object element, String pseudo, - CSSEngine engine) throws Exception { - // TODO Auto-generated method stub - return null; - } - - @Override - public String retrieveCSSPropertyFontVariant(Object element, String pseudo, - CSSEngine engine) throws Exception { - // TODO Auto-generated method stub - return null; - } - - @Override - public String retrieveCSSPropertyFontWeight(Object element, String pseudo, - CSSEngine engine) throws Exception { - // TODO Auto-generated method stub - return null; - } - - private void insertElement(Element element, String elementName) { - Element b = element.getOwnerDocument().createElement(elementName); - NodeList nodes = element.getChildNodes(); - for (int i = 0; i < nodes.getLength(); i++) { - Node node = nodes.item(i); - b.appendChild(node.cloneNode(true)); - node.getParentNode().removeChild(node); - } - element.appendChild(b); - } - -} diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/xml/properties/css2/CSSPropertyTextXMLHandler.java 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/xml/properties/css2/CSSPropertyTextXMLHandler.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/xml/properties/css2/CSSPropertyTextXMLHandler.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/xml/properties/css2/CSSPropertyTextXMLHandler.java 1970-01-01 00:00:00.000000000 +0000 @@ -1,56 +0,0 @@ -/******************************************************************************* - * 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 - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Angelo Zerr - initial API and implementation - * Lars Vogel - Bug 422702 - *******************************************************************************/ -package org.eclipse.e4.ui.css.xml.properties.css2; - -import org.eclipse.e4.ui.css.core.dom.properties.css2.AbstractCSSPropertyTextHandler; -import org.eclipse.e4.ui.css.core.dom.properties.css2.ICSSPropertyTextHandler; -import org.eclipse.e4.ui.css.core.engine.CSSEngine; -import org.w3c.dom.Element; -import org.w3c.dom.css.CSSPrimitiveValue; -import org.w3c.dom.css.CSSValue; - -/** - * - */ -public class CSSPropertyTextXMLHandler extends AbstractCSSPropertyTextHandler { - - public final static ICSSPropertyTextHandler INSTANCE = new CSSPropertyTextXMLHandler(); - - @Override - public boolean applyCSSProperty(Object node, String property, - CSSValue value, String pseudo, CSSEngine engine) throws Exception { - if (node instanceof Element) { - super.applyCSSProperty(node, property, value, pseudo, - engine); - return true; - } - return false; - } - - @Override - public void applyCSSPropertyColor(Object node, CSSValue value, - String pseudo, CSSEngine engine) throws Exception { - if (value.getCssValueType() == CSSValue.CSS_PRIMITIVE_VALUE) { - // Add color attribute - Element element = (Element) node; - CSSPrimitiveValue primitiveValue = (CSSPrimitiveValue) value; - element.setAttribute("color", primitiveValue.getStringValue()); - } - } - - public String retrieveCSSPropertyColor(Object node, CSSEngine engine) - throws Exception { - Element element = (Element) node; - return element.getAttribute("color"); - } - -} diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.swt/about.html 4.9-1/bundles/org.eclipse.e4.ui.css.swt/about.html --- 4.8-1/bundles/org.eclipse.e4.ui.css.swt/about.html 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.swt/about.html 2018-09-06 11:21:18.000000000 +0000 @@ -2,27 +2,35 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + About -

    About This Content

    - -

    November 20, 2008

    -

    License

    +

    About This Content

    -

    The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise -indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at http://www.eclipse.org/legal/epl-v10.html. -For purposes of the EPL, "Program" will mean the Content.

    +

    November 30, 2017

    +

    License

    -

    If you did not receive this Content directly from the Eclipse Foundation, the Content is -being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor's license that was -provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at http://www.eclipse.org.

    +

    + The Eclipse Foundation makes available all content in this plug-in + ("Content"). Unless otherwise indicated below, the Content + is provided to you under the terms and conditions of the Eclipse + Public License Version 2.0 ("EPL"). A copy of the EPL is + available at http://www.eclipse.org/legal/epl-2.0. + For purposes of the EPL, "Program" will mean the Content. +

    + +

    + If you did not receive this Content directly from the Eclipse + Foundation, the Content is being redistributed by another party + ("Redistributor") and different terms and conditions may + apply to your use of any object code in the Content. Check the + Redistributor's license that was provided with the Content. If no such + license exists, contact the Redistributor. Unless otherwise indicated + below, the terms and conditions of the EPL still apply to any source + code in the Content and such source code may be obtained at http://www.eclipse.org. +

    \ No newline at end of file diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.swt/build.properties 4.9-1/bundles/org.eclipse.e4.ui.css.swt/build.properties --- 4.8-1/bundles/org.eclipse.e4.ui.css.swt/build.properties 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.swt/build.properties 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2010, 2016 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 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.swt/META-INF/MANIFEST.MF 4.9-1/bundles/org.eclipse.e4.ui.css.swt/META-INF/MANIFEST.MF --- 4.8-1/bundles/org.eclipse.e4.ui.css.swt/META-INF/MANIFEST.MF 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.swt/META-INF/MANIFEST.MF 2018-09-06 11:21:18.000000000 +0000 @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.e4.ui.css.swt;singleton:=true -Bundle-Version: 0.13.100.qualifier +Bundle-Version: 0.13.200.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.swt/plugin.properties 4.9-1/bundles/org.eclipse.e4.ui.css.swt/plugin.properties --- 4.8-1/bundles/org.eclipse.e4.ui.css.swt/plugin.properties 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.swt/plugin.properties 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ ############################################################################### # Copyright (c) 2010, 2012 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 +# +# This program and the accompanying materials +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Contributors: # IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.swt/plugin.xml 4.9-1/bundles/org.eclipse.e4.ui.css.swt/plugin.xml --- 4.8-1/bundles/org.eclipse.e4.ui.css.swt/plugin.xml 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.swt/plugin.xml 2018-09-06 11:21:18.000000000 +0000 @@ -2,6 +2,7 @@ @@ -55,6 +56,7 @@ eclipse.platform.ui eclipse.platform.ui - 4.8.0-SNAPSHOT + 4.9.0-SNAPSHOT ../../ org.eclipse.e4 org.eclipse.e4.ui.css.swt - 0.13.100-SNAPSHOT + 0.13.200-SNAPSHOT eclipse-plugin diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/CSSSWTConstants.java 4.9-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/CSSSWTConstants.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/CSSSWTConstants.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/CSSSWTConstants.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/ButtonElement.java 4.9-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/ButtonElement.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/ButtonElement.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/ButtonElement.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009, 2017 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/CompositeElement.java 4.9-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/CompositeElement.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/CompositeElement.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/CompositeElement.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009, 2014 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation @@ -23,7 +26,7 @@ import org.w3c.dom.Node; * */ public class CompositeElement extends ControlElement { - private final static String BACKGROUND_OVERRIDDEN_BY_CSS_MARKER = "bgOverriddenByCSS"; + private static final String BACKGROUND_OVERRIDDEN_BY_CSS_MARKER = "bgOverriddenByCSS"; public CompositeElement(Composite composite, CSSEngine engine) { super(composite, engine); diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/ControlElement.java 4.9-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/ControlElement.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/ControlElement.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/ControlElement.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009, 2017 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/CTabFolderElement.java 4.9-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/CTabFolderElement.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/CTabFolderElement.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/CTabFolderElement.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009, 2014 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation @@ -37,7 +40,7 @@ import org.w3c.dom.NodeList; * */ public class CTabFolderElement extends CompositeElement implements ChildVisibilityAwareElement { - private final static String BACKGROUND_SET_BY_TAB_RENDERER = "bgSetByTabRenderer"; //$NON-NLS-1$ + private static final String BACKGROUND_SET_BY_TAB_RENDERER = "bgSetByTabRenderer"; //$NON-NLS-1$ private SelectionListener selectionListener = new SelectionAdapter() { @Override diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/CTabItemElement.java 4.9-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/CTabItemElement.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/CTabItemElement.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/CTabItemElement.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2013, 2014 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/definition/ColorDefinitionElement.java 4.9-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/definition/ColorDefinitionElement.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/definition/ColorDefinitionElement.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/definition/ColorDefinitionElement.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/definition/FontDefinitionElement.java 4.9-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/definition/FontDefinitionElement.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/definition/FontDefinitionElement.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/definition/FontDefinitionElement.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/definition/ThemeDefinitionElement.java 4.9-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/definition/ThemeDefinitionElement.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/definition/ThemeDefinitionElement.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/definition/ThemeDefinitionElement.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2013, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/definition/ThemeElementDefinitionProvider.java 4.9-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/definition/ThemeElementDefinitionProvider.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/definition/ThemeElementDefinitionProvider.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/definition/ThemeElementDefinitionProvider.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2013, 2014 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/definition/ThemesExtensionElement.java 4.9-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/definition/ThemesExtensionElement.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/definition/ThemesExtensionElement.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/definition/ThemesExtensionElement.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2013, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/html/SWTHTMLElement.java 4.9-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/html/SWTHTMLElement.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/html/SWTHTMLElement.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/html/SWTHTMLElement.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2014 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/html/SWTHTMLElementProvider.java 4.9-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/html/SWTHTMLElementProvider.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/html/SWTHTMLElementProvider.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/html/SWTHTMLElementProvider.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/ISelectionBackgroundCustomizationElement.java 4.9-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/ISelectionBackgroundCustomizationElement.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/ISelectionBackgroundCustomizationElement.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/ISelectionBackgroundCustomizationElement.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2015 Fabio Zadrozny and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Fabio Zadrozny - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/ItemElement.java 4.9-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/ItemElement.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/ItemElement.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/ItemElement.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/LinkElement.java 4.9-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/LinkElement.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/LinkElement.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/LinkElement.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2016 Fabio Zadrozny and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Fabio Zadrozny - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/preference/EclipsePreferencesElement.java 4.9-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/preference/EclipsePreferencesElement.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/preference/EclipsePreferencesElement.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/preference/EclipsePreferencesElement.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2013, 2017 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/preference/EclipsePreferencesProvider.java 4.9-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/preference/EclipsePreferencesProvider.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/preference/EclipsePreferencesProvider.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/preference/EclipsePreferencesProvider.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2014, 2016 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/ScaleElement.java 4.9-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/ScaleElement.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/ScaleElement.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/ScaleElement.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/ShellElement.java 4.9-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/ShellElement.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/ShellElement.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/ShellElement.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009, 2017 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/StyledTextElement.java 4.9-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/StyledTextElement.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/StyledTextElement.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/StyledTextElement.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2016 Fabio Zadrozny and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Fabio Zadrozny - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/SWTElementProvider.java 4.9-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/SWTElementProvider.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/SWTElementProvider.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/SWTElementProvider.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2016 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/TableElement.java 4.9-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/TableElement.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/TableElement.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/TableElement.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2015 Fabio Zadrozny and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Fabio Zadrozny - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/TableItemElement.java 4.9-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/TableItemElement.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/TableItemElement.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/TableItemElement.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009, 2017 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/TextElement.java 4.9-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/TextElement.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/TextElement.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/TextElement.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2009, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/ToolBarElement.java 4.9-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/ToolBarElement.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/ToolBarElement.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/ToolBarElement.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2013, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/ToolItemElement.java 4.9-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/ToolItemElement.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/ToolItemElement.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/ToolItemElement.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2013, 2014 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/TreeElement.java 4.9-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/TreeElement.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/TreeElement.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/TreeElement.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2015 Fabio Zadrozny and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Fabio Zadrozny - initial API and implementation @@ -30,11 +33,11 @@ implements ISelectionBackgroundCustomiza private static boolean showedUnsupportedWarning = false; - private final static String TREE_ARROWS_FOREGROUND_COLOR = "org.eclipse.e4.ui.css.swt.treeArrowsForegroundColor"; //$NON-NLS-1$ - private final static String TREE_ARROWS_MODE = "org.eclipse.e4.ui.css.swt.treeArrowsMode"; //$NON-NLS-1$ + private static final String TREE_ARROWS_FOREGROUND_COLOR = "org.eclipse.e4.ui.css.swt.treeArrowsForegroundColor"; //$NON-NLS-1$ + private static final String TREE_ARROWS_MODE = "org.eclipse.e4.ui.css.swt.treeArrowsMode"; //$NON-NLS-1$ - private final static String TREE_ARROWS_MODE_TRIANGLE = "triangle"; //$NON-NLS-1$ - private final static String TREE_ARROWS_MODE_SQUARE = "square"; //$NON-NLS-1$ + private static final String TREE_ARROWS_MODE_TRIANGLE = "triangle"; //$NON-NLS-1$ + private static final String TREE_ARROWS_MODE_SQUARE = "square"; //$NON-NLS-1$ private static abstract class TreeItemPaintListener implements Listener { @Override diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/WidgetElement.java 4.9-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/WidgetElement.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/WidgetElement.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/dom/WidgetElement.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2016 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/engine/AbstractCSSSWTEngineImpl.java 4.9-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/engine/AbstractCSSSWTEngineImpl.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/engine/AbstractCSSSWTEngineImpl.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/engine/AbstractCSSSWTEngineImpl.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2014 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/engine/CSSSWTApplyStylesListener.java 4.9-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/engine/CSSSWTApplyStylesListener.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/engine/CSSSWTApplyStylesListener.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/engine/CSSSWTApplyStylesListener.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/engine/CSSSWTEngineImpl.java 4.9-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/engine/CSSSWTEngineImpl.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/engine/CSSSWTEngineImpl.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/engine/CSSSWTEngineImpl.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2014 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/engine/html/CSSSWTHTMLEngineImpl.java 4.9-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/engine/html/CSSSWTHTMLEngineImpl.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/engine/html/CSSSWTHTMLEngineImpl.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/engine/html/CSSSWTHTMLEngineImpl.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/helpers/CSSSWTColorHelper.java 4.9-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/helpers/CSSSWTColorHelper.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/helpers/CSSSWTColorHelper.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/helpers/CSSSWTColorHelper.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/helpers/CSSSWTCursorHelper.java 4.9-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/helpers/CSSSWTCursorHelper.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/helpers/CSSSWTCursorHelper.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/helpers/CSSSWTCursorHelper.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2014 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/helpers/CSSSWTFontHelper.java 4.9-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/helpers/CSSSWTFontHelper.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/helpers/CSSSWTFontHelper.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/helpers/CSSSWTFontHelper.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2014 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/helpers/CSSSWTHelpers.java 4.9-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/helpers/CSSSWTHelpers.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/helpers/CSSSWTHelpers.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/helpers/CSSSWTHelpers.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2015 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Angelo Zerr - initial API and implementation diff -pruN 4.8-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/helpers/CSSSWTImageHelper.java 4.9-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/helpers/CSSSWTImageHelper.java --- 4.8-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/helpers/CSSSWTImageHelper.java 2018-06-07 09:21:04.000000000 +0000 +++ 4.9-1/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/helpers/CSSSWTImageHelper.java 2018-09-06 11:21:18.000000000 +0000 @@ -1,9 +1,12 @@ /******************************************************************************* * Copyright (c) 2008, 2018 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 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public Licens