[509216] Use icons located in org.eclipse.mat.ui.rcp for the RCPs
The icons for the product were present redundantly - in
org.eclipse.mat.ui.rcp and in org.eclipse.mat.product. This change
deletes one of the copy and leaves the ones within the rcp plugin.
This plugin also contains the branding information.
Bug: 509216
Change-Id: Iddcc8921430ce8337abf74c9c19dda823a2ca171
Signed-off-by: Krum Tsvetkov <krum.tsvetkov@sap.com>
diff --git a/org.eclipse.mat.product/icons/copy.gif b/org.eclipse.mat.product/icons/copy.gif
deleted file mode 100644
index 71d7c95..0000000
--- a/org.eclipse.mat.product/icons/copy.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mat.product/icons/eclipse_lg.gif b/org.eclipse.mat.product/icons/eclipse_lg.gif
deleted file mode 100644
index bf8b872..0000000
--- a/org.eclipse.mat.product/icons/eclipse_lg.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mat.product/icons/help.gif b/org.eclipse.mat.product/icons/help.gif
deleted file mode 100644
index 787e064..0000000
--- a/org.eclipse.mat.product/icons/help.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mat.product/icons/memory_analyzer_16.gif b/org.eclipse.mat.product/icons/memory_analyzer_16.gif
deleted file mode 100644
index dcdffbc..0000000
--- a/org.eclipse.mat.product/icons/memory_analyzer_16.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mat.product/icons/memory_analyzer_32.gif b/org.eclipse.mat.product/icons/memory_analyzer_32.gif
deleted file mode 100644
index 79ebb2e..0000000
--- a/org.eclipse.mat.product/icons/memory_analyzer_32.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mat.product/icons/open_snapshot.gif b/org.eclipse.mat.product/icons/open_snapshot.gif
deleted file mode 100644
index 56c7428..0000000
--- a/org.eclipse.mat.product/icons/open_snapshot.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mat.product/macosx/MemoryAnalyzer.icns b/org.eclipse.mat.product/macosx/MemoryAnalyzer.icns
deleted file mode 100644
index 610976e..0000000
--- a/org.eclipse.mat.product/macosx/MemoryAnalyzer.icns
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mat.product/mat.product b/org.eclipse.mat.product/mat.product
index 17243e7..4b777a4 100644
--- a/org.eclipse.mat.product/mat.product
+++ b/org.eclipse.mat.product/mat.product
@@ -4,7 +4,7 @@
<product name="Memory Analyzer Tool" uid="org.eclipse.mat.ui.rcp.MemoryAnalyzer" id="org.eclipse.mat.ui.rcp.MemoryAnalyzer" application="org.eclipse.mat.ui.rcp.application" version="1.7.0" useFeatures="true" includeLaunchers="true">
<aboutInfo>
- <image path="/org.eclipse.mat.product/icons/eclipse_lg.gif"/>
+ <image path="/org.eclipse.mat.ui.rcp/icons/eclipse_lg.gif"/>
<text>
Eclipse Memory Analyzer
@@ -24,7 +24,7 @@
-XstartOnFirstThread</vmArgsMac>
</launcherArgs>
- <windowImages i16="/org.eclipse.mat.product/icons/memory_analyzer_16.gif" i32="/org.eclipse.mat.product/icons/memory_analyzer_32.gif"/>
+ <windowImages i16="/org.eclipse.mat.ui.rcp/icons/memory_analyzer_16.gif" i32="/org.eclipse.mat.ui.rcp/icons/memory_analyzer_32.gif"/>
<splash
location="org.eclipse.mat.ui.rcp"
@@ -32,7 +32,6 @@
startupMessageRect="7,252,445,20"
startupForegroundColor="000000" />
<launcher name="MemoryAnalyzer">
- <macosx icon="../org.eclipse.mat.product/macosx/MemoryAnalyzer.icns"/>
<solaris/>
<win useIco="false">
<bmp/>
diff --git a/plugins/org.eclipse.mat.ui.rcp/mat.product b/plugins/org.eclipse.mat.ui.rcp/mat.product
deleted file mode 100644
index fb47d4c..0000000
--- a/plugins/org.eclipse.mat.ui.rcp/mat.product
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?pde version="3.5"?>
-
-<product name="%product.appName" uid="org.eclipse.mat.ui.rcp.MemoryAnalyzer" id="org.eclipse.mat.ui.rcp.MemoryAnalyzer" application="org.eclipse.mat.ui.rcp.application" version="1.7.0" useFeatures="true" includeLaunchers="true">
-
- <aboutInfo>
- <image path="/org.eclipse.mat.ui.rcp/icons/eclipse_lg.gif"/>
- <text>
- %product.aboutText
- </text>
- </aboutInfo>
-
- <configIni use="default">
- </configIni>
-
- <launcherArgs>
- <vmArgs>-Xmx1024m</vmArgs>
- <vmArgsMac>-Dorg.eclipse.swt.internal.carbon.smallFonts
--XstartOnFirstThread</vmArgsMac>
- </launcherArgs>
-
- <windowImages i16="/org.eclipse.mat.ui.rcp/icons/memory_analyzer_16.gif" i32="/org.eclipse.mat.ui.rcp/icons/memory_analyzer_32.gif"/>
-
- <splash
- location="org.eclipse.mat.ui.rcp" />
- <launcher name="MemoryAnalyzer">
- <macosx icon="/org.eclipse.mat.ui.rcp/product/macosx/MemoryAnalyzer.icns"/>
- <solaris/>
- <win useIco="false">
- <bmp/>
- </win>
- </launcher>
-
- <intro introId="org.eclipse.mat.ui.rcp.Intro"/>
-
- <vm>
- </vm>
-
- <license>
- <url>%product.licenseURL</url>
- <text>
- %product.license
- </text>
- </license>
-
- <copyright>
- %copyright
- </copyright>
-
- <plugins>
- </plugins>
-
- <features>
- <feature id="org.eclipse.mat.dependencies.feature" version="1.7.0.qualifier"/>
- <feature id="org.eclipse.mat.feature" version="1.7.0.qualifier"/>
- <feature id="org.eclipse.mat.chart.feature" version="1.7.0.qualifier"/>
- <feature id="org.eclipse.mat.ui.rcp.feature" version="1.7.0.qualifier"/>
- </features>
-
- <configurations>
- <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />
- <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="2" />
- <property name="osgi.requiredJavaVersion" value="1.5.0"/>
- </configurations>
-
-</product>
