From 49cb924f5402c9d24379ae1af62def6fa5892649 Mon Sep 17 00:00:00 2001 From: Alexander Kriegisch Date: Fri, 4 Jun 2021 07:58:52 +0700 Subject: Upgrade license from CPLv1/EPLv1 to EPLv2 This was required by the Eclipse team as one precondition for the next release. Signed-off-by: Alexander Kriegisch --- docs/teaching/exercises/answers/Answer1a.java | 4 ++-- docs/teaching/exercises/answers/Answer1b.java | 4 ++-- docs/teaching/exercises/answers/Answer1c.java | 4 ++-- docs/teaching/exercises/answers/Answer2a.java | 4 ++-- docs/teaching/exercises/answers/Answer2b.java | 4 ++-- docs/teaching/exercises/answers/Answer2c.java | 4 ++-- docs/teaching/exercises/answers/Answer2d.java | 4 ++-- docs/teaching/exercises/answers/Answer2e.java | 4 ++-- docs/teaching/exercises/answers/Answer2f.java | 4 ++-- docs/teaching/exercises/answers/Answer3a.java | 4 ++-- docs/teaching/exercises/answers/Answer3b.java | 10 +++++----- docs/teaching/exercises/answers/Answer3c.java | 6 +++--- docs/teaching/exercises/answers/Answer3d.java | 8 ++++---- docs/teaching/exercises/answers/Answer3e.java | 10 +++++----- docs/teaching/exercises/answers/Answer4a.java | 4 ++-- docs/teaching/exercises/answers/Answer4b.java | 6 +++--- docs/teaching/exercises/answers/Answer4c.java | 10 +++++----- docs/teaching/exercises/answers/Answer4d.java | 14 +++++++------- docs/teaching/exercises/answers/Answer4e.java | 16 ++++++++-------- 19 files changed, 62 insertions(+), 62 deletions(-) (limited to 'docs/teaching/exercises/answers') diff --git a/docs/teaching/exercises/answers/Answer1a.java b/docs/teaching/exercises/answers/Answer1a.java index 138312d8d..09c41a28d 100644 --- a/docs/teaching/exercises/answers/Answer1a.java +++ b/docs/teaching/exercises/answers/Answer1a.java @@ -2,9 +2,9 @@ * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC). * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * PARC initial implementation diff --git a/docs/teaching/exercises/answers/Answer1b.java b/docs/teaching/exercises/answers/Answer1b.java index e2718c9f8..95c6e130d 100644 --- a/docs/teaching/exercises/answers/Answer1b.java +++ b/docs/teaching/exercises/answers/Answer1b.java @@ -2,9 +2,9 @@ * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC). * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * PARC initial implementation diff --git a/docs/teaching/exercises/answers/Answer1c.java b/docs/teaching/exercises/answers/Answer1c.java index 613731639..f90dc8bcc 100644 --- a/docs/teaching/exercises/answers/Answer1c.java +++ b/docs/teaching/exercises/answers/Answer1c.java @@ -2,9 +2,9 @@ * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC). * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * PARC initial implementation diff --git a/docs/teaching/exercises/answers/Answer2a.java b/docs/teaching/exercises/answers/Answer2a.java index 22e77a5e8..46519a83e 100644 --- a/docs/teaching/exercises/answers/Answer2a.java +++ b/docs/teaching/exercises/answers/Answer2a.java @@ -2,9 +2,9 @@ * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC). * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * PARC initial implementation diff --git a/docs/teaching/exercises/answers/Answer2b.java b/docs/teaching/exercises/answers/Answer2b.java index c6f38faca..c9ba82bee 100644 --- a/docs/teaching/exercises/answers/Answer2b.java +++ b/docs/teaching/exercises/answers/Answer2b.java @@ -2,9 +2,9 @@ * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC). * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * PARC initial implementation diff --git a/docs/teaching/exercises/answers/Answer2c.java b/docs/teaching/exercises/answers/Answer2c.java index 5e792b8f2..2364aaeb0 100644 --- a/docs/teaching/exercises/answers/Answer2c.java +++ b/docs/teaching/exercises/answers/Answer2c.java @@ -2,9 +2,9 @@ * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC). * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * PARC initial implementation diff --git a/docs/teaching/exercises/answers/Answer2d.java b/docs/teaching/exercises/answers/Answer2d.java index 6fd93b813..0d99f537f 100644 --- a/docs/teaching/exercises/answers/Answer2d.java +++ b/docs/teaching/exercises/answers/Answer2d.java @@ -2,9 +2,9 @@ * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC). * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * PARC initial implementation diff --git a/docs/teaching/exercises/answers/Answer2e.java b/docs/teaching/exercises/answers/Answer2e.java index db49b90c1..7da69c313 100644 --- a/docs/teaching/exercises/answers/Answer2e.java +++ b/docs/teaching/exercises/answers/Answer2e.java @@ -2,9 +2,9 @@ * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC). * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * PARC initial implementation diff --git a/docs/teaching/exercises/answers/Answer2f.java b/docs/teaching/exercises/answers/Answer2f.java index 8d9849037..f8992ccf9 100644 --- a/docs/teaching/exercises/answers/Answer2f.java +++ b/docs/teaching/exercises/answers/Answer2f.java @@ -2,9 +2,9 @@ * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC). * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * PARC initial implementation diff --git a/docs/teaching/exercises/answers/Answer3a.java b/docs/teaching/exercises/answers/Answer3a.java index 6f2f1b8d9..d48924ee8 100644 --- a/docs/teaching/exercises/answers/Answer3a.java +++ b/docs/teaching/exercises/answers/Answer3a.java @@ -2,9 +2,9 @@ * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC). * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * PARC initial implementation diff --git a/docs/teaching/exercises/answers/Answer3b.java b/docs/teaching/exercises/answers/Answer3b.java index ae8837456..4fe3072fa 100644 --- a/docs/teaching/exercises/answers/Answer3b.java +++ b/docs/teaching/exercises/answers/Answer3b.java @@ -2,9 +2,9 @@ * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC). * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * PARC initial implementation @@ -21,10 +21,10 @@ import figures.FigureElement; aspect Answer3b { before(Object o): execution(public * *(..)) - && !execution(public String toString(..)) + && !execution(public String toString(..)) // or perhaps !cflow(adviceexecution()) - && within(figures.*) - && target(o) + && within(figures.*) + && target(o) { Log.write(thisJoinPoint + " at " + o); } diff --git a/docs/teaching/exercises/answers/Answer3c.java b/docs/teaching/exercises/answers/Answer3c.java index 89b8378d1..198558d06 100644 --- a/docs/teaching/exercises/answers/Answer3c.java +++ b/docs/teaching/exercises/answers/Answer3c.java @@ -2,9 +2,9 @@ * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC). * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * PARC initial implementation @@ -18,7 +18,7 @@ import figures.*; aspect Answer3c { before(): - execution(void Group.add(FigureElement)) + execution(void Group.add(FigureElement)) && args(Point) { Log.write("adding Point"); } diff --git a/docs/teaching/exercises/answers/Answer3d.java b/docs/teaching/exercises/answers/Answer3d.java index 3ce984904..b2e74218c 100755 --- a/docs/teaching/exercises/answers/Answer3d.java +++ b/docs/teaching/exercises/answers/Answer3d.java @@ -2,9 +2,9 @@ * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC). * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * PARC initial implementation @@ -20,8 +20,8 @@ aspect Answer3d { private boolean Point.inGroup = false; - before(Point p): - execution(void Group.add(FigureElement)) + before(Point p): + execution(void Group.add(FigureElement)) && args(p) { if (p.inGroup) { throw new IllegalStateException(); diff --git a/docs/teaching/exercises/answers/Answer3e.java b/docs/teaching/exercises/answers/Answer3e.java index 19199afd1..505aa22c6 100755 --- a/docs/teaching/exercises/answers/Answer3e.java +++ b/docs/teaching/exercises/answers/Answer3e.java @@ -2,9 +2,9 @@ * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC). * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * PARC initial implementation @@ -20,9 +20,9 @@ aspect Answer3e { private Group Point.containingGroup = null; - before(Group g, Point p): - execution(void Group.add(FigureElement)) - && this(g) + before(Group g, Point p): + execution(void Group.add(FigureElement)) + && this(g) && args(p) { if (p.containingGroup != null) { throw new IllegalStateException(p.containingGroup.toString()); diff --git a/docs/teaching/exercises/answers/Answer4a.java b/docs/teaching/exercises/answers/Answer4a.java index f7350e842..99fa96cc1 100644 --- a/docs/teaching/exercises/answers/Answer4a.java +++ b/docs/teaching/exercises/answers/Answer4a.java @@ -2,9 +2,9 @@ * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC). * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * PARC initial implementation diff --git a/docs/teaching/exercises/answers/Answer4b.java b/docs/teaching/exercises/answers/Answer4b.java index bde0a74e1..2e77fd862 100644 --- a/docs/teaching/exercises/answers/Answer4b.java +++ b/docs/teaching/exercises/answers/Answer4b.java @@ -2,9 +2,9 @@ * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC). * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * PARC initial implementation @@ -20,7 +20,7 @@ aspect Answer4b { private Rectangle Group.cache = null; Rectangle around(Group g): - execution(Rectangle Group.getBounds()) + execution(Rectangle Group.getBounds()) && this(g) { if (g.cache == null) { g.cache = proceed(g); diff --git a/docs/teaching/exercises/answers/Answer4c.java b/docs/teaching/exercises/answers/Answer4c.java index 795b5db80..c9d0e8415 100644 --- a/docs/teaching/exercises/answers/Answer4c.java +++ b/docs/teaching/exercises/answers/Answer4c.java @@ -2,9 +2,9 @@ * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC). * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * PARC initial implementation @@ -20,7 +20,7 @@ aspect Answer4c { private Rectangle Group.cache = null; Rectangle around(Group g): - execution(Rectangle Group.getBounds()) + execution(Rectangle Group.getBounds()) && this(g) { if (g.cache == null) { g.cache = proceed(g); @@ -28,8 +28,8 @@ aspect Answer4c { return g.cache; } - before(Group g): - call(void move(int, int)) + before(Group g): + call(void move(int, int)) && target(g) { g.cache = null; } diff --git a/docs/teaching/exercises/answers/Answer4d.java b/docs/teaching/exercises/answers/Answer4d.java index cc6c4785e..2f019c249 100644 --- a/docs/teaching/exercises/answers/Answer4d.java +++ b/docs/teaching/exercises/answers/Answer4d.java @@ -2,9 +2,9 @@ * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC). * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * PARC initial implementation @@ -22,14 +22,14 @@ aspect Answer4d { private Group Point.enclosingGroup = null; before(Point p, Group g): - execution(void add(FigureElement)) - && args(p) + execution(void add(FigureElement)) + && args(p) && target(g) { p.enclosingGroup = g; } Rectangle around(Group g): - execution(Rectangle Group.getBounds()) + execution(Rectangle Group.getBounds()) && this(g) { if (g.cache == null) { g.cache = proceed(g); @@ -37,8 +37,8 @@ aspect Answer4d { return g.cache; } - before(Point p): - set(* Point.*) + before(Point p): + set(* Point.*) && target(p) { if (p.enclosingGroup != null) { p.enclosingGroup.cache = null; diff --git a/docs/teaching/exercises/answers/Answer4e.java b/docs/teaching/exercises/answers/Answer4e.java index 7d7be5b91..e3d6fa3d4 100644 --- a/docs/teaching/exercises/answers/Answer4e.java +++ b/docs/teaching/exercises/answers/Answer4e.java @@ -2,9 +2,9 @@ * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC). * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * PARC initial implementation @@ -21,15 +21,15 @@ aspect Answer4e { private Rectangle Group.cache = null; private Group FigureElement.enclosingGroup = null; - before(FigureElement p, Group g): - execution(void add(FigureElement)) - && args(p) + before(FigureElement p, Group g): + execution(void add(FigureElement)) + && args(p) && target(g) { p.enclosingGroup = g; } Rectangle around(Group g): - execution(Rectangle Group.getBounds()) + execution(Rectangle Group.getBounds()) && this(g) { if (g.cache == null) { g.cache = proceed(g); @@ -37,8 +37,8 @@ aspect Answer4e { return g.cache; } - before(Point p): - set(* Point.*) + before(Point p): + set(* Point.*) && target(p) { FigureElement fe = p; while (fe.enclosingGroup != null) { -- cgit v1.2.3