aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKonstantin Komissarchik2013-07-11 22:22:59 (EDT)
committerKonstantin Komissarchik2013-07-11 22:25:00 (EDT)
commit4c9b9c7c8560eb580c438208bf21bce039a9d105 (patch)
treefcc440d4ae6524e04d5d82b9f06cb5d9db916f25
parent188aeb55c48f0676b28f402588c8a13b3ac2af0c (diff)
downloadorg.eclipse.sapphire-4c9b9c7c8560eb580c438208bf21bce039a9d105.zip
org.eclipse.sapphire-4c9b9c7c8560eb580c438208bf21bce039a9d105.tar.gz
org.eclipse.sapphire-4c9b9c7c8560eb580c438208bf21bce039a9d105.tar.bz2
Enhancement : Edit nested properties in table property editor
Fixed a regression. Must substitute template parameters in property editor path before looking up the property. Bugzilla : https://bugs.eclipse.org/bugs/show_bug.cgi?id=401225
-rw-r--r--plugins/org.eclipse.sapphire.ui/src/org/eclipse/sapphire/ui/PropertyEditorPart.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/plugins/org.eclipse.sapphire.ui/src/org/eclipse/sapphire/ui/PropertyEditorPart.java b/plugins/org.eclipse.sapphire.ui/src/org/eclipse/sapphire/ui/PropertyEditorPart.java
index 4a43333..91112b0 100644
--- a/plugins/org.eclipse.sapphire.ui/src/org/eclipse/sapphire/ui/PropertyEditorPart.java
+++ b/plugins/org.eclipse.sapphire.ui/src/org/eclipse/sapphire/ui/PropertyEditorPart.java
@@ -119,11 +119,12 @@ public final class PropertyEditorPart extends FormComponentPart
final ISapphireUiDef rootdef = this.definition.nearest( ISapphireUiDef.class );
final PropertyEditorDef propertyEditorPartDef = (PropertyEditorDef) this.definition;
- this.property = getModelElement().property( new ModelPath( propertyEditorPartDef.getProperty().text() ) );
+ final String propertyEditorPath = substituteParams( propertyEditorPartDef.getProperty().text() );
+ this.property = getModelElement().property( new ModelPath( propertyEditorPath ) );
if( this.property == null )
{
- throw new RuntimeException( invalidPath.format( propertyEditorPartDef.getProperty().text() ) );
+ throw new RuntimeException( invalidPath.format( propertyEditorPath ) );
}
// Read the property to ensure that initial events are broadcast and avoid being surprised