Attachment 285658 Details for Bug 571476 – Patch for bug 571476

[patch] Patch for bug 571476

changes.patch (text/plain), 11.07 KB, created by Harsha Krishnareddy

on 2021-02-24 15:28:42 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Harsha Krishnareddy

Created: 2021-02-24 15:28:42 EST

Size: 11.07 KB

patch

obsolete

>From 1fb06803df43b0848f1648abd2bc15f32203dc67 Mon Sep 17 00:00:00 2001
>From: "Harsha V. Krishnareddy" <c0mpiler@outlook.com>
>Date: Wed, 24 Feb 2021 14:56:04 -0500
>Subject: [PATCH 1/5] updating to use Java v11
>
>---
> org.eclipse.stem/core/org.eclipse.stem.ui/stem4.product | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
>diff --git a/org.eclipse.stem/core/org.eclipse.stem.ui/stem4.product b/org.eclipse.stem/core/org.eclipse.stem.ui/stem4.product
>index 894337cfa..549b72a17 100644
>--- a/org.eclipse.stem/core/org.eclipse.stem.ui/stem4.product
>+++ b/org.eclipse.stem/core/org.eclipse.stem.ui/stem4.product
>@@ -35,8 +35,9 @@
>       </win>
>    </launcher>
>
>+
>    <vm>
>-      <macos include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8</macos>
>+      <macos include="true">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11</macos>
>    </vm>
>
>    <license>
>--
>2.28.0
>
>
>From 9a4c7206ce873adefe2e7fbb669563a3096a728b Mon Sep 17 00:00:00 2001
>From: "Harsha V. Krishnareddy" <c0mpiler@outlook.com>
>Date: Wed, 24 Feb 2021 14:56:34 -0500
>Subject: [PATCH 2/5] Updating dependincies for target platform
>
>---
> .../STEM4.target                              | 59 +++++++++++--------
> 1 file changed, 35 insertions(+), 24 deletions(-)
>
>diff --git a/org.eclipse.stem/releng/org.eclipse.stem.releng.targetplatforms/STEM4.target b/org.eclipse.stem/releng/org.eclipse.stem.releng.targetplatforms/STEM4.target
>index 76db54d68..231619ae8 100644
>--- a/org.eclipse.stem/releng/org.eclipse.stem.releng.targetplatforms/STEM4.target
>+++ b/org.eclipse.stem/releng/org.eclipse.stem.releng.targetplatforms/STEM4.target
>@@ -1,25 +1,36 @@
>-<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target includeMode="feature" name="STEM4" sequenceNumber="6">
>-<locations>
>-<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
>-<unit id="org.eclipse.birt.feature.group" version="4.7.0.v201706222054"/>
>-<unit id="org.eclipse.emf.sdk.feature.group" version="2.13.0.v20170609-0928"/>
>-<unit id="org.eclipse.xtext.sdk.feature.group" version="2.12.0.v20170519-1412"/>
>-<unit id="org.eclipse.zest.sdk.feature.group" version="1.7.0.201606061308"/>
>-<repository location="http://download.eclipse.org/releases/oxygen"/>
>-</location>
>-<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
>-<unit id="org.apache.batik.dom" version="1.7.1.v201505191845"/>
>-<unit id="org.apache.batik.dom.svg" version="1.7.0.v201011041433"/>
>-<unit id="org.apache.batik.svggen" version="1.7.0.v201011041433"/>
>-<unit id="org.apache.commons.collections" version="3.2.2.v201511171945"/>
>-<unit id="org.apache.commons.io" version="2.2.0.v201405211200"/>
>-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170919201930/repository/"/>
>-</location>
>-<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
>-<unit id="org.eclipse.equinox.executable" version="3.7.2.v20171108-1834"/>
>-<unit id="org.eclipse.equinox.executable.feature.group" version="3.7.2.v20171108-1834"/>
>-<unit id="org.eclipse.sdk.ide" version="4.7.2.M20171130-0510"/>
>-<repository location="http://download.eclipse.org/eclipse/updates/4.7"/>
>-</location>
>-</locations>
>+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
>+<?pde version="3.8"?>
>+<target includeMode="feature" name="STEM4_hk" sequenceNumber="6">
>+	<locations>
>+		<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
>+	      	<unit id="org.eclipse.birt.feature.group" version="4.7.0.v201706222054"/>
>+			<repository location="http://download.eclipse.org/releases/2019-09"/>
>+	    </location>
>+
>+		<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
>+			<unit id="org.eclipse.emf.sdk.feature.group" version="2.25.0.v20210114-1734"/>
>+			<unit id="org.eclipse.xtext.sdk.feature.group" version="2.25.0.v20210111-0955"/>
>+			<unit id="org.eclipse.zest.sdk.feature.group" version="1.7.0.201606061308"/>
>+
>+			<repository location="https://download.eclipse.org/releases/2021-03"/>
>+		</location>
>+
>+		<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
>+			<unit id="org.apache.batik.dom" version="1.13.0.v20201124-1839"/>
>+			<unit id="org.apache.batik.dom.svg" version="1.13.0.v20201124-1839"/>
>+			<unit id="org.apache.batik.svggen" version="1.13.0.v20201124-1836"/>
>+			<unit id="org.apache.commons.collections4" version="4.4.0.v20200420-1700"/>
>+			<unit id="org.apache.commons.io" version="2.6.0.v20190123-2029"/>
>+
>+			<repository location="https://download.eclipse.org/tools/orbit/downloads/drops2/S20210216215844/repository/"/>
>+		</location>
>+
>+		<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
>+			<unit id="org.eclipse.sdk.ide" version="4.18.0.I20201202-1800"/>
>+			<unit id="org.eclipse.equinox.executable"/>
>+			<unit id="org.eclipse.equinox.executable.feature.group"/>
>+
>+			<repository location="http://download.eclipse.org/eclipse/updates/4.18"/>
>+		</location>
>+	</locations>
> </target>
>\ No newline at end of file
>--
>2.28.0
>
>
>From 68d2d0a1555c4244c79aa0ce1d3e9e34b9d11b7f Mon Sep 17 00:00:00 2001
>From: "Harsha V. Krishnareddy" <c0mpiler@outlook.com>
>Date: Wed, 24 Feb 2021 14:56:46 -0500
>Subject: [PATCH 3/5] Updating dependincies for target platform
>
>---
> .../STEM4_old.target                          | 27 +++++++++++++++++++
> 1 file changed, 27 insertions(+)
> create mode 100644 org.eclipse.stem/releng/org.eclipse.stem.releng.targetplatforms/STEM4_old.target
>
>diff --git a/org.eclipse.stem/releng/org.eclipse.stem.releng.targetplatforms/STEM4_old.target b/org.eclipse.stem/releng/org.eclipse.stem.releng.targetplatforms/STEM4_old.target
>new file mode 100644
>index 000000000..e69b7bea6
>--- /dev/null
>+++ b/org.eclipse.stem/releng/org.eclipse.stem.releng.targetplatforms/STEM4_old.target
>@@ -0,0 +1,27 @@
>+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
>+<?pde version="3.8"?>
>+<target includeMode="feature" name="STEM4" sequenceNumber="6">
>+<locations>
>+<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
>+<unit id="org.eclipse.birt.feature.group" version="4.7.0.v201706222054"/>
>+<unit id="org.eclipse.emf.sdk.feature.group" version="2.13.0.v20170609-0928"/>
>+<unit id="org.eclipse.xtext.sdk.feature.group" version="2.12.0.v20170519-1412"/>
>+<unit id="org.eclipse.zest.sdk.feature.group" version="1.7.0.201606061308"/>
>+<repository location="http://download.eclipse.org/releases/oxygen"/>
>+</location>
>+<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
>+<unit id="org.apache.batik.dom" version="1.7.1.v201505191845"/>
>+<unit id="org.apache.batik.dom.svg" version="1.7.0.v201011041433"/>
>+<unit id="org.apache.batik.svggen" version="1.7.0.v201011041433"/>
>+<unit id="org.apache.commons.collections" version="3.2.2.v201511171945"/>
>+<unit id="org.apache.commons.io" version="2.2.0.v201405211200"/>
>+<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170919201930/repository/"/>
>+</location>
>+<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
>+<unit id="org.eclipse.equinox.executable" version="3.7.2.v20171108-1834"/>
>+<unit id="org.eclipse.equinox.executable.feature.group" version="3.7.2.v20171108-1834"/>
>+<unit id="org.eclipse.sdk.ide" version="4.7.2.M20171130-0510"/>
>+<repository location="http://download.eclipse.org/eclipse/updates/4.7"/>
>+</location>
>+</locations>
>+</target>
>\ No newline at end of file
>--
>2.28.0
>
>
>From 1c322aaeb5c1ef09743752dc663d7d81a6279717 Mon Sep 17 00:00:00 2001
>From: "Harsha V. Krishnareddy" <c0mpiler@outlook.com>
>Date: Wed, 24 Feb 2021 14:57:53 -0500
>Subject: [PATCH 4/5] updating apache commons collections->collections4
>
>---
> .../org.eclipse.stem.loggers.imagewriter/META-INF/MANIFEST.MF | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/org.eclipse.stem/core/org.eclipse.stem.loggers.imagewriter/META-INF/MANIFEST.MF b/org.eclipse.stem/core/org.eclipse.stem.loggers.imagewriter/META-INF/MANIFEST.MF
>index fa050dd63..886adc68a 100644
>--- a/org.eclipse.stem/core/org.eclipse.stem.loggers.imagewriter/META-INF/MANIFEST.MF
>+++ b/org.eclipse.stem/core/org.eclipse.stem.loggers.imagewriter/META-INF/MANIFEST.MF
>@@ -11,13 +11,13 @@ Require-Bundle: org.eclipse.core.runtime,
>  org.eclipse.emf.ecore.edit;visibility:=reexport,
>  org.eclipse.emf.ecore.xmi;visibility:=reexport,
>  org.eclipse.stem.loggers,
>- org.eclipse.stem.ui.loggers,
>+ org.eclipse.stem.ui.loggers,
>  org.eclipse.stem.core,
>  org.eclipse.stem.definitions,
>  org.eclipse.stem.jobs,
>  org.eclipse.stem.ui,
>  org.eclipse.stem.diseasemodels,
>- org.apache.commons.collections
>+ org.apache.commons.collections4;bundle-version="4.4.0"
> Bundle-ActivationPolicy: lazy
> Bundle-Vendor: %providerName
> Bundle-Activator: org.eclipse.stem.loggers.imagewriter.Activator
>--
>2.28.0
>
>
>From c30bb1c56fe68b40f33201b1bfec03bea65b8cf0 Mon Sep 17 00:00:00 2001
>From: "Harsha V. Krishnareddy" <c0mpiler@outlook.com>
>Date: Wed, 24 Feb 2021 15:00:32 -0500
>Subject: [PATCH 5/5] adapting apache commons collections->collections4 imports
>
>---
> .../stem/loggers/imagewriter/logger/PolygonHandler.java      | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
>diff --git a/org.eclipse.stem/core/org.eclipse.stem.loggers.imagewriter/src/org/eclipse/stem/loggers/imagewriter/logger/PolygonHandler.java b/org.eclipse.stem/core/org.eclipse.stem.loggers.imagewriter/src/org/eclipse/stem/loggers/imagewriter/logger/PolygonHandler.java
>index 8c35c0332..8664a54a4 100644
>--- a/org.eclipse.stem/core/org.eclipse.stem.loggers.imagewriter/src/org/eclipse/stem/loggers/imagewriter/logger/PolygonHandler.java
>+++ b/org.eclipse.stem/core/org.eclipse.stem.loggers.imagewriter/src/org/eclipse/stem/loggers/imagewriter/logger/PolygonHandler.java
>@@ -20,7 +20,8 @@ import java.util.LinkedList;
> import java.util.List;
> import java.util.Map;
>
>-import org.apache.commons.collections.map.ReferenceMap;
>+import org.apache.commons.collections4.map.ReferenceMap;
>+import org.apache.commons.collections4.map.AbstractReferenceMap.ReferenceStrength;
> import org.eclipse.stem.core.common.Identifiable;
> import org.eclipse.stem.core.graph.DynamicNodeLabel;
> import org.eclipse.stem.core.graph.NodeLabel;
>@@ -113,7 +114,7 @@ public class PolygonHandler
> 		Map projectionCache = cachedPolygons.get(projection.getClass());
> 		if (projectionCache == null) {
> 			// create a new map entry for the projection
>-			projectionCache = new ReferenceMap(ReferenceMap.SOFT, ReferenceMap.SOFT);
>+			projectionCache = new ReferenceMap(ReferenceStrength.SOFT, ReferenceStrength.SOFT);
> 			cachedPolygons.put(projection.getClass(), projectionCache);
> 		}
>
>--
>2.28.0

Actions: View | Diff

Attachments on bug 571476: 285658