diff options
author | Vincent Lorenzo | 2020-01-30 10:29:11 +0000 |
---|---|---|
committer | Vincent Lorenzo | 2020-02-17 16:26:20 +0000 |
commit | 877c806bc1b75bcb3e2b08db68991d35f050c710 (patch) | |
tree | 74da7d86938b173a2f6eaab22755b9dfee534e52 | |
parent | be3bea00749f1dbea3d55c169b7f5dbd1f471e15 (diff) | |
download | org.eclipse.papyrus-877c806bc1b75bcb3e2b08db68991d35f050c710.tar.gz org.eclipse.papyrus-877c806bc1b75bcb3e2b08db68991d35f050c710.tar.xz org.eclipse.papyrus-877c806bc1b75bcb3e2b08db68991d35f050c710.zip |
Bug 552101 - [Toolsmiths][Table] The generation of table configuration from a table does not work
- add a refresh
- fix broken externalized string
Change-Id: I99ef469e1e91978ca28732b37dd391351b9a9d47
Signed-off-by: Vincent Lorenzo <vincent.lorenzo@cea.fr>
4 files changed, 18 insertions, 10 deletions
diff --git a/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.nattable/src/org/eclipse/papyrus/toolsmiths/nattable/messages/Messages.java b/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.nattable/src/org/eclipse/papyrus/toolsmiths/nattable/messages/Messages.java index 8d0842d6a49..637eb9638ca 100755 --- a/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.nattable/src/org/eclipse/papyrus/toolsmiths/nattable/messages/Messages.java +++ b/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.nattable/src/org/eclipse/papyrus/toolsmiths/nattable/messages/Messages.java @@ -23,7 +23,9 @@ public class Messages extends NLS { public static String DefineOutputPluginWizardPage_Output; public static String DefineOutputPluginWizardPage_OUTPUT_PAGE_TILE; public static String DefineOutputPluginWizardPage_ProjectMustBeSet; - public static String DefineOutputPluginWizardPage_SelectOuputPlugin; + public static String DefineOutputPluginWizardPage_SelectOutputPluginProject; + public static String DefineOutputPluginWizardPage_SelectOutput; + public static String DefineOutputPluginWizardPage_SelectOutputPlugin; public static String DefineTableConfigurationDataWizardPage_ConfigureTableConfiguration; public static String DefineTableConfigurationDataWizardPage_DataPageTitle; public static String DefineTableConfigurationDataWizardPage_DefineTableConfigurationDescription; diff --git a/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.nattable/src/org/eclipse/papyrus/toolsmiths/nattable/messages/messages.properties b/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.nattable/src/org/eclipse/papyrus/toolsmiths/nattable/messages/messages.properties index bd1f5fc4ce2..201befc5251 100755 --- a/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.nattable/src/org/eclipse/papyrus/toolsmiths/nattable/messages/messages.properties +++ b/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.nattable/src/org/eclipse/papyrus/toolsmiths/nattable/messages/messages.properties @@ -4,7 +4,9 @@ DefineOutputPluginWizardPage_DefineTheOuput=Define the output. DefineOutputPluginWizardPage_Output=Output DefineOutputPluginWizardPage_OUTPUT_PAGE_TILE=Define Output Page DefineOutputPluginWizardPage_ProjectMustBeSet=Project must be set. -DefineOutputPluginWizardPage_SelectOuputPlugin=Select output project. +DefineOutputPluginWizardPage_SelectOutputPluginProject=Select output plugin project. +DefineOutputPluginWizardPage_SelectOutput=Select output +DefineOutputPluginWizardPage_SelectOutputPlugin=Select the output plugin. DefineTableConfigurationDataWizardPage_ConfigureTableConfiguration=Configure TableConfiguration. DefineTableConfigurationDataWizardPage_DataPageTitle=Data Page Title DefineTableConfigurationDataWizardPage_DefineTableConfigurationDescription=Define TableConfiguration Description @@ -21,7 +23,7 @@ TableChecker_Warning_TableIsInverted=The choose table is inverted: \n\t we are n TableConfigurationUtils_PluginXMLCanBeCreated=The plugin.xml editor can't be created to register the new table configuration. WarningOnCurrentTableWizardPage_OKMessageRead=OK WarningOnCurrentTableWizardPage_PleaseCheckDocumentation=Please checks documentation\! -ExportAsTableConfigurationWizard_CheckTableConfigurationDependencies=Check TableConfiguration dependencies.\ +ExportAsTableConfigurationWizard_CheckTableConfigurationDependencies=Check TableConfiguration dependencies. ExportAsTableConfigurationWizard_ErrorDuringTableConfigurationCreation=Error during the Table Configuration Creation ExportAsTableConfigurationWizard_IconFolderCantBeCreated=The folder icon {0} can't be created in the project {1} ExportAsTableConfigurationWizard_ManifestEditorCantRegisterDependencies=The MANIFEST.MF file editor can't be created to register required dependencies. @@ -38,4 +40,3 @@ RegisterTableConfigurationInArchitectureFrameworkHandler_SelectViewPointsToContr RegisterTableConfigurationInArchitectureFrameworkHandler_SeveralViewpointsAreAvailable=Several viewpoints are available. Please select the viewpoints to contribute. RegisterTableConfigurationInArchitectureFrameworkHandler_SelectConcernsToContribute=Select Concerns to Contribute RegisterTableConfigurationInArchitectureFrameworkHandler_SeveralConcernsAreAvailable=Several Concerns are available. Please select the concerns to contribute. -ContributionToNewChildMenu_RegisterExitingTableConfigurationMenuItem=Register Existing Table Configuration 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 94e0ed3aeaf..005cb185851 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 @@ -28,6 +28,7 @@ import java.util.List; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFolder; +import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.Assert; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.FileLocator; @@ -158,6 +159,12 @@ public class ExportAsTableConfigurationWizard extends Wizard implements IExportW if (false == status.isOK()) { MessageDialog.openError(Display.getCurrent().getActiveShell(), Messages.ExportAsTableConfigurationWizard_ErrorDuringTableConfigurationCreation, status.getMessage()); } + // refresh workspace + try { + outputJavaProject.getProject().refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor()); + } catch (CoreException e) { + Activator.log.error(e); + } return true; } @@ -323,12 +330,10 @@ public class ExportAsTableConfigurationWizard extends Wizard implements IExportW // 9. we check the table created table configuration reloading it - // ResourcesPlugin.getWorkspace().getRoot().getProject().re try { - outputJavaProject.getProject().refreshLocal(-1, new NullProgressMonitor()); + outputJavaProject.getProject().refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor()); } catch (CoreException e) { - // TODO Auto-generated catch block - e.printStackTrace(); + Activator.log.error(e); } checkTableConfigurationDependencies(tableConfigurationURI); return Status.OK_STATUS; diff --git a/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.nattable/src/org/eclipse/papyrus/toolsmiths/nattable/wizard/pages/DefineOutputPluginWizardPage.java b/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.nattable/src/org/eclipse/papyrus/toolsmiths/nattable/wizard/pages/DefineOutputPluginWizardPage.java index d7f8861cea9..5f651c139e9 100755 --- a/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.nattable/src/org/eclipse/papyrus/toolsmiths/nattable/wizard/pages/DefineOutputPluginWizardPage.java +++ b/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.nattable/src/org/eclipse/papyrus/toolsmiths/nattable/wizard/pages/DefineOutputPluginWizardPage.java @@ -109,7 +109,7 @@ public class DefineOutputPluginWizardPage extends AbstractExportTableAsTableConf ouputData.horizontalSpan = 2; final Label outputLabel = new Label(outputGroup, SWT.NONE); - outputLabel.setText(Messages.DefineOutputPluginWizardPage_SelectOuputPlugin); + outputLabel.setText(Messages.DefineOutputPluginWizardPage_SelectOutputPluginProject); outputLabel.setLayoutData(ouputData); ouputData = new GridData(GridData.FILL_HORIZONTAL); @@ -149,7 +149,7 @@ public class DefineOutputPluginWizardPage extends AbstractExportTableAsTableConf @Override public void widgetSelected(final SelectionEvent e) { if (this.outputPluginWorkspaceButton == e.widget) { - final IContainer[] ifile = WorkspaceResourceDialog.openFolderSelection(getShell(), null, null, false, new IContainer[] {}, this.javaProjectFilter); + final IContainer[] ifile = WorkspaceResourceDialog.openFolderSelection(getShell(), Messages.DefineOutputPluginWizardPage_SelectOutput, Messages.DefineOutputPluginWizardPage_SelectOutputPlugin, false, new IContainer[] {}, this.javaProjectFilter); if (ifile.length > 0) { this.outputJavaProject = (IJavaProject) JavaCore.create(ifile[0]); this.outputPluginNameTextField.setText(this.outputJavaProject.getPath().toString()); |