diff options
| author | Vincent Lorenzo | 2013-08-21 15:29:07 +0000 |
|---|---|---|
| committer | Vincent Lorenzo | 2013-08-21 15:29:07 +0000 |
| commit | bc668d3eca6c12457202b13651b3dcaa7c03f444 (patch) | |
| tree | 54cf62ffe3b10bd470bf459392af80bdbbf640be /extraplugins | |
| parent | 993e9acc13aefa91cac4212867da6bf5e4ac36ac (diff) | |
| download | org.eclipse.papyrus-bc668d3eca6c12457202b13651b3dcaa7c03f444.tar.gz org.eclipse.papyrus-bc668d3eca6c12457202b13651b3dcaa7c03f444.tar.xz org.eclipse.papyrus-bc668d3eca6c12457202b13651b3dcaa7c03f444.zip | |
400779: [Table 2] Tabular Editor must allow to create elements with a
Paste from an external speadsheet
https://bugs.eclipse.org/bugs/show_bug.cgi?id=400779
Configure the paste for Requirement table and Allocation table
+ Fixed some obvious errors
Diffstat (limited to 'extraplugins')
3 files changed, 7 insertions, 2 deletions
diff --git a/extraplugins/table/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/NattableModelManager.java b/extraplugins/table/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/NattableModelManager.java index c425f296363..2922798bed1 100644 --- a/extraplugins/table/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/NattableModelManager.java +++ b/extraplugins/table/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/NattableModelManager.java @@ -1301,14 +1301,14 @@ public class NattableModelManager extends AbstractNattableWidgetManager implemen try {
Thread.sleep(100);
} catch (InterruptedException e) {
- Activator.log.equals(e);
+ Activator.log.error(e);
}
}
while(cell.getColumnWrapper().getElement() == null || cell.getRowWrapper().getElement() == null) {
try {
Thread.sleep(100);
} catch (InterruptedException e) {
- Activator.log.equals(e);
+ Activator.log.error(e);
}
}
return new CellMapKey(cell.getColumnWrapper().getElement(), cell.getRowWrapper().getElement());
diff --git a/extraplugins/table/org.eclipse.papyrus.sysml.nattable.allocation.config/resources/allocation.nattableconfiguration b/extraplugins/table/org.eclipse.papyrus.sysml.nattable.allocation.config/resources/allocation.nattableconfiguration index cb405f06092..bc3054acfee 100644 --- a/extraplugins/table/org.eclipse.papyrus.sysml.nattable.allocation.config/resources/allocation.nattableconfiguration +++ b/extraplugins/table/org.eclipse.papyrus.sysml.nattable.allocation.config/resources/allocation.nattableconfiguration @@ -6,6 +6,10 @@ <ownedAxisConfigurations xsi:type="nattableaxisconfiguration:EStructuralFeatureValueFillingConfiguration">
<listenFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/ownedMember"/>
</ownedAxisConfigurations>
+ <ownedAxisConfigurations xsi:type="nattableaxisconfiguration:PasteEObjectConfiguration" pastedElementId="org.eclipse.papyrus.sysml.Allocate">
+ <pasteElementContainementFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Package/packagedElement"/>
+ <postActions>applyStereotype:/SysML::Allocations::Allocate</postActions>
+ </ownedAxisConfigurations>
<axisManagers xsi:type="nattableaxisconfiguration:AxisManagerRepresentation" axisManagerId="org.eclipse.papyrus.sysml.nattable.allocate.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.labelprovider" headerLabelConfiguration="//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.0" specificAxisConfigurations="//@rowHeaderAxisConfiguration/@ownedAxisConfigurations.0"/>
</rowHeaderAxisConfiguration>
<columnHeaderAxisConfiguration xsi:type="nattableaxisconfiguration:TableHeaderAxisConfiguration">
diff --git a/extraplugins/table/org.eclipse.papyrus.sysml.nattable.requirement.config/configs/requirement.nattableconfiguration b/extraplugins/table/org.eclipse.papyrus.sysml.nattable.requirement.config/configs/requirement.nattableconfiguration index 167569ee004..255510ad166 100644 --- a/extraplugins/table/org.eclipse.papyrus.sysml.nattable.requirement.config/configs/requirement.nattableconfiguration +++ b/extraplugins/table/org.eclipse.papyrus.sysml.nattable.requirement.config/configs/requirement.nattableconfiguration @@ -7,6 +7,7 @@ <listenFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/ownedMember"/>
</ownedAxisConfigurations>
<ownedAxisConfigurations xsi:type="nattableaxisconfiguration:PasteEObjectConfiguration" pastedElementId="org.eclipse.papyrus.sysml.Requirement">
+ <postActions>applyStereotype:/SysML::Requirements::Requirement</postActions>
<pasteElementContainementFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Package/packagedElement"/>
</ownedAxisConfigurations>
<axisManagers xsi:type="nattableaxisconfiguration:AxisManagerRepresentation" axisManagerId="org.eclipse.papyrus.sysml.nattable.requirement.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.labelprovider" headerLabelConfiguration="//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.0" specificAxisConfigurations="//@rowHeaderAxisConfiguration/@ownedAxisConfigurations.0"/>
|