Attachment #285658 for bug #571476

View | Details | Raw Unified | Return to bug 571476
Collapse All | Expand All

Lines 35-42 Link Here

(-)a/org.eclipse.stem/core/org.eclipse.stem.ui/stem4.product (-3 / +2 lines)
35	</win>	35	</win>
36	</launcher>	36	</launcher>
		37
37	<vm>	38	<vm>
38	<macos include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8</macos>	39	<macos include="true">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11</macos>
39	</vm>	40	</vm>
40	<license>	41	<license>
41	-
42	--
43	.../STEM4.target \| 59 +++++++++++--------	42	.../STEM4.target \| 59 +++++++++++--------
44	1 file changed, 35 insertions(+), 24 deletions(-)	43	1 file changed, 35 insertions(+), 24 deletions(-)




<?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>
-
--
.../STEM4_old.target                          | 27 +++++++++++++++++++
1 file changed, 27 insertions(+)
create mode 100644 org.eclipse.stem/releng/org.eclipse.stem.releng.targetplatforms/STEM4_old.target




<?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>
.../org.eclipse.stem.loggers.imagewriter/META-INF/MANIFEST.MF | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)




 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.core,
 org.eclipse.stem.definitions,
 org.eclipse.stem.jobs,
 org.eclipse.stem.ui,
 org.eclipse.stem.diseasemodels,
 org.apache.commons.collections4;bundle-version="4.4.0"
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %providerName
Bundle-Activator: org.eclipse.stem.loggers.imagewriter.Activator
-
--
.../stem/loggers/imagewriter/logger/PolygonHandler.java      | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

Lines 20-26 import java.util.LinkedList; Link Here

(-)a/org.eclipse.stem/core/org.eclipse.stem.loggers.imagewriter/src/org/eclipse/stem/loggers/imagewriter/logger/PolygonHandler.java (-3 / +3 lines)
20	import java.util.List;	20	import java.util.List;
21	import java.util.Map;	21	import java.util.Map;
22	import org.apache.commons.collections.map.ReferenceMap;	22	import org.apache.commons.collections4.map.ReferenceMap;
		23	import org.apache.commons.collections4.map.AbstractReferenceMap.ReferenceStrength;
23	import org.eclipse.stem.core.common.Identifiable;	24	import org.eclipse.stem.core.common.Identifiable;
24	import org.eclipse.stem.core.graph.DynamicNodeLabel;	25	import org.eclipse.stem.core.graph.DynamicNodeLabel;
25	import org.eclipse.stem.core.graph.NodeLabel;	26	import org.eclipse.stem.core.graph.NodeLabel;
Lines 113-119 public class PolygonHandler Link Here
113	Map projectionCache = cachedPolygons.get(projection.getClass());	114	Map projectionCache = cachedPolygons.get(projection.getClass());
114	if (projectionCache == null) {	115	if (projectionCache == null) {
115	// create a new map entry for the projection	116	// create a new map entry for the projection
116	projectionCache = new ReferenceMap(ReferenceMap.SOFT, ReferenceMap.SOFT);	117	projectionCache = new ReferenceMap(ReferenceStrength.SOFT, ReferenceStrength.SOFT);
117	cachedPolygons.put(projection.getClass(), projectionCache);	118	cachedPolygons.put(projection.getClass(), projectionCache);
118	}	119	}
119	-

Return to bug 571476

Lines 1-25 Link Here

(-)a/org.eclipse.stem/releng/org.eclipse.stem.releng.targetplatforms/STEM4.target (-26 / +35 lines)
1	<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target includeMode="feature" name="STEM4" sequenceNumber="6">	1	<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2	<locations>	2	<?pde version="3.8"?>
3	<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">	3	<target includeMode="feature" name="STEM4_hk" sequenceNumber="6">
4	<unit id="org.eclipse.birt.feature.group" version="4.7.0.v201706222054"/>	4	<locations>
5	<unit id="org.eclipse.emf.sdk.feature.group" version="2.13.0.v20170609-0928"/>	5	<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
6	<unit id="org.eclipse.xtext.sdk.feature.group" version="2.12.0.v20170519-1412"/>	6	<unit id="org.eclipse.birt.feature.group" version="4.7.0.v201706222054"/>
7	<unit id="org.eclipse.zest.sdk.feature.group" version="1.7.0.201606061308"/>	7	<repository location="http://download.eclipse.org/releases/2019-09"/>
8	<repository location="http://download.eclipse.org/releases/oxygen"/>	8	</location>
9	</location>	9
10	<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">	10	<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
11	<unit id="org.apache.batik.dom" version="1.7.1.v201505191845"/>	11	<unit id="org.eclipse.emf.sdk.feature.group" version="2.25.0.v20210114-1734"/>
12	<unit id="org.apache.batik.dom.svg" version="1.7.0.v201011041433"/>	12	<unit id="org.eclipse.xtext.sdk.feature.group" version="2.25.0.v20210111-0955"/>
13	<unit id="org.apache.batik.svggen" version="1.7.0.v201011041433"/>	13	<unit id="org.eclipse.zest.sdk.feature.group" version="1.7.0.201606061308"/>
14	<unit id="org.apache.commons.collections" version="3.2.2.v201511171945"/>	14
15	<unit id="org.apache.commons.io" version="2.2.0.v201405211200"/>	15	<repository location="https://download.eclipse.org/releases/2021-03"/>
16	<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170919201930/repository/"/>	16	</location>
17	</location>	17
18	<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">	18	<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
19	<unit id="org.eclipse.equinox.executable" version="3.7.2.v20171108-1834"/>	19	<unit id="org.apache.batik.dom" version="1.13.0.v20201124-1839"/>
20	<unit id="org.eclipse.equinox.executable.feature.group" version="3.7.2.v20171108-1834"/>	20	<unit id="org.apache.batik.dom.svg" version="1.13.0.v20201124-1839"/>
21	<unit id="org.eclipse.sdk.ide" version="4.7.2.M20171130-0510"/>	21	<unit id="org.apache.batik.svggen" version="1.13.0.v20201124-1836"/>
22	<repository location="http://download.eclipse.org/eclipse/updates/4.7"/>	22	<unit id="org.apache.commons.collections4" version="4.4.0.v20200420-1700"/>
23	</location>	23	<unit id="org.apache.commons.io" version="2.6.0.v20190123-2029"/>
24	</locations>	24
		25	<repository location="https://download.eclipse.org/tools/orbit/downloads/drops2/S20210216215844/repository/"/>
		26	</location>
		27
		28	<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
		29	<unit id="org.eclipse.sdk.ide" version="4.18.0.I20201202-1800"/>
		30	<unit id="org.eclipse.equinox.executable"/>
		31	<unit id="org.eclipse.equinox.executable.feature.group"/>
		32
		33	<repository location="http://download.eclipse.org/eclipse/updates/4.18"/>
		34	</location>
		35	</locations>
25	</target>	36	</target>
26	-
27	--
28	.../STEM4_old.target \| 27 +++++++++++++++++++	37	.../STEM4_old.target \| 27 +++++++++++++++++++
29	1 file changed, 27 insertions(+)	38	1 file changed, 27 insertions(+)
30	create mode 100644 org.eclipse.stem/releng/org.eclipse.stem.releng.targetplatforms/STEM4_old.target	39	create mode 100644 org.eclipse.stem/releng/org.eclipse.stem.releng.targetplatforms/STEM4_old.target

Lines 11-23 Require-Bundle: org.eclipse.core.runtime, Link Here

(-)a/org.eclipse.stem/core/org.eclipse.stem.loggers.imagewriter/META-INF/MANIFEST.MF (-4 / +2 lines)
11	org.eclipse.emf.ecore.edit;visibility:=reexport,	11	org.eclipse.emf.ecore.edit;visibility:=reexport,
12	org.eclipse.emf.ecore.xmi;visibility:=reexport,	12	org.eclipse.emf.ecore.xmi;visibility:=reexport,
13	org.eclipse.stem.loggers,	13	org.eclipse.stem.loggers,
14	org.eclipse.stem.ui.loggers,	14	org.eclipse.stem.ui.loggers,
15	org.eclipse.stem.core,	15	org.eclipse.stem.core,
16	org.eclipse.stem.definitions,	16	org.eclipse.stem.definitions,
17	org.eclipse.stem.jobs,	17	org.eclipse.stem.jobs,
18	org.eclipse.stem.ui,	18	org.eclipse.stem.ui,
19	org.eclipse.stem.diseasemodels,	19	org.eclipse.stem.diseasemodels,
20	org.apache.commons.collections	20	org.apache.commons.collections4;bundle-version="4.4.0"
21	Bundle-ActivationPolicy: lazy	21	Bundle-ActivationPolicy: lazy
22	Bundle-Vendor: %providerName	22	Bundle-Vendor: %providerName
23	Bundle-Activator: org.eclipse.stem.loggers.imagewriter.Activator	23	Bundle-Activator: org.eclipse.stem.loggers.imagewriter.Activator
24	-
25	--
26	.../stem/loggers/imagewriter/logger/PolygonHandler.java \| 5 +++--	24	.../stem/loggers/imagewriter/logger/PolygonHandler.java \| 5 +++--
27	1 file changed, 3 insertions(+), 2 deletions(-)	25	1 file changed, 3 insertions(+), 2 deletions(-)