Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPauline DEVILLE2019-10-15 08:52:12 +0000
committerPauline DEVILLE2019-10-15 08:53:39 +0000
commit9527d4bc66d7f3134fe672696844995e8c934129 (patch)
tree0e0e31520a26783380873c6f973800e6c6a569d5
parentf5074adf13d2b72af978f2fe2c1b05d33f7404da (diff)
downloadorg.eclipse.papyrus-9527d4bc66d7f3134fe672696844995e8c934129.tar.gz
org.eclipse.papyrus-9527d4bc66d7f3134fe672696844995e8c934129.tar.xz
org.eclipse.papyrus-9527d4bc66d7f3134fe672696844995e8c934129.zip
Bug 552101 - [Toolsmiths][Table] The generation of table configuration
from a table does not work Change-Id: Iaf90ff7045005792b9efc0684fd14e48ca7e128f Signed-off-by: Pauline DEVILLE <pauline.deville@cea.fr>
-rwxr-xr-xplugins/doc/org.eclipse.papyrus.infra.nattable.doc/src/site/mediawiki/toolsmiths/nattableToolsmiths.mediawiki2
-rwxr-xr-xplugins/toolsmiths/org.eclipse.papyrus.toolsmiths.nattable/src/org/eclipse/papyrus/toolsmiths/nattable/wizard/ExportAsTableConfigurationWizard.java6
2 files changed, 3 insertions, 5 deletions
diff --git a/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/src/site/mediawiki/toolsmiths/nattableToolsmiths.mediawiki b/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/src/site/mediawiki/toolsmiths/nattableToolsmiths.mediawiki
index 9ee478881a0..db13a12275e 100755
--- a/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/src/site/mediawiki/toolsmiths/nattableToolsmiths.mediawiki
+++ b/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/src/site/mediawiki/toolsmiths/nattableToolsmiths.mediawiki
@@ -14,7 +14,7 @@
You can cancel or continue after this page.
*''First page'':
-**you must select an existing plugin as output of the table configuration file
+**you must select an existing '''plugin''' as output of the table configuration file
[[File:images/CreateTableConfigurationFromTable_OutputPage.png|frame|none]]
*''Second page'':
**You must define the name and the type of your new table configuration. The description is not mandatory.
diff --git a/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.nattable/src/org/eclipse/papyrus/toolsmiths/nattable/wizard/ExportAsTableConfigurationWizard.java b/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.nattable/src/org/eclipse/papyrus/toolsmiths/nattable/wizard/ExportAsTableConfigurationWizard.java
index 06c2135f96c..94e0ed3aeaf 100755
--- a/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.nattable/src/org/eclipse/papyrus/toolsmiths/nattable/wizard/ExportAsTableConfigurationWizard.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.nattable/src/org/eclipse/papyrus/toolsmiths/nattable/wizard/ExportAsTableConfigurationWizard.java
@@ -10,6 +10,7 @@
*
* Contributors:
* Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ * Pauline DEVILLE (CEA LIST) pauline.deville@cea.fr - Bug 552101
*
*****************************************************************************/
package org.eclipse.papyrus.toolsmiths.nattable.wizard;
@@ -33,7 +34,6 @@ import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Status;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.resource.Resource;
@@ -62,7 +62,6 @@ import org.eclipse.papyrus.toolsmiths.nattable.wizard.pages.WarningOnCurrentTabl
import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.IExportWizard;
import org.eclipse.ui.IWorkbench;
-import org.osgi.framework.Bundle;
@@ -242,8 +241,7 @@ public class ExportAsTableConfigurationWizard extends Wizard implements IExportW
newIconPath = URI.createPlatformPluginURI(imageFilePNG.getFullPath().toPortableString(), true).toString();
// 3.2 we create the defaut table icon, using the PNG format.
if (!imageFilePNG.exists()) {
- final Bundle bundle = Platform.getBundle(Activator.PLUGIN_ID);
- final URL fileURL = bundle.getResource(DEFAULT_TABLE_ICON);
+ final URL fileURL = org.eclipse.papyrus.infra.widgets.Activator.getDefault().getURL(Activator.PLUGIN_ID, DEFAULT_TABLE_ICON);
File file = null;
try {
file = new File(FileLocator.resolve(fileURL).toURI());

Back to the top