Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenoit Maggi2017-10-31 05:47:22 -0400
committerBenoit Maggi2017-10-31 05:47:22 -0400
commitf04a57c5723bab9b994ae65c3346e6ecf5dba7be (patch)
tree44fa3a05c6f5e5a1746518c3c510d79bd63741f8 /examples
parentc022e227d510d7fd09971ef391d76e04842b88aa (diff)
downloadorg.eclipse.papyrus-f04a57c5723bab9b994ae65c3346e6ecf5dba7be.tar.gz
org.eclipse.papyrus-f04a57c5723bab9b994ae65c3346e6ecf5dba7be.tar.xz
org.eclipse.papyrus-f04a57c5723bab9b994ae65c3346e6ecf5dba7be.zip
Bug 526676 - [Example] Textual Editor property view missing
- fix namespaces in xwt files - use meaning full labels - add missing license Change-Id: I3e341d06d1f745dae3170392d3835e406f1fcf47 Signed-off-by: Benoit Maggi <benoit.maggi@cea.fr>
Diffstat (limited to 'examples')
-rw-r--r--examples/uml/org.eclipse.papyrus.uml.textual.editors.example/model/UML/ui/OperationExample.xwt8
-rw-r--r--examples/uml/org.eclipse.papyrus.uml.textual.editors.example/model/UML/ui/PropertyExample.xwt8
-rw-r--r--examples/uml/org.eclipse.papyrus.uml.textual.editors.example/src/org/eclipse/papyrus/uml/textual/editors/example/Activator.java12
3 files changed, 20 insertions, 8 deletions
diff --git a/examples/uml/org.eclipse.papyrus.uml.textual.editors.example/model/UML/ui/OperationExample.xwt b/examples/uml/org.eclipse.papyrus.uml.textual.editors.example/model/UML/ui/OperationExample.xwt
index 413bc6c02f7..f1f372f2889 100644
--- a/examples/uml/org.eclipse.papyrus.uml.textual.editors.example/model/UML/ui/OperationExample.xwt
+++ b/examples/uml/org.eclipse.papyrus.uml.textual.editors.example/model/UML/ui/OperationExample.xwt
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<Composite
- xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
- xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"
+ xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+ xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
xmlns:umlXtext="clr-namespace:org.eclipse.papyrus.uml.properties.xtext"
xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
xmlns:xtext="clr-namespace:org.eclipse.papyrus.infra.widgets.xtext.creation"
@@ -43,8 +43,8 @@
property="UML:BehavioralFeature:method"></ppe:MultiReference>
<ppe:MultiReference input="{Binding}"
property="UML:BehavioralFeature:ownedParameter"></ppe:MultiReference>
- <ppe:MultiReference input="{Binding}" property="UML:Operation:precondition" customLabel="oldPreCondition"></ppe:MultiReference>
- <ppe:CompletionStyledTextMultiReference input="{Binding}" property="UML:Operation:precondition" customLabel="NewPreCondition"></ppe:CompletionStyledTextMultiReference>
+ <ppe:MultiReference input="{Binding}" property="UML:Operation:precondition" customLabel="Classic PreCondition"></ppe:MultiReference>
+ <ppe:CompletionStyledTextMultiReference input="{Binding}" property="UML:Operation:precondition" customLabel="Auto-fill Precondition"></ppe:CompletionStyledTextMultiReference>
<ppe:MultiReference input="{Binding}"
property="UML:Operation:postcondition"></ppe:MultiReference>
</Composite>
diff --git a/examples/uml/org.eclipse.papyrus.uml.textual.editors.example/model/UML/ui/PropertyExample.xwt b/examples/uml/org.eclipse.papyrus.uml.textual.editors.example/model/UML/ui/PropertyExample.xwt
index c9e45dd834a..738b6f4c795 100644
--- a/examples/uml/org.eclipse.papyrus.uml.textual.editors.example/model/UML/ui/PropertyExample.xwt
+++ b/examples/uml/org.eclipse.papyrus.uml.textual.editors.example/model/UML/ui/PropertyExample.xwt
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"
- xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+ xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
xmlns:xtexteditor="clr-namespace:org.eclipse.papyrus.uml.properties.xtext.widget.property"
xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt">
<Composite.layout>
@@ -29,9 +29,9 @@
property="UML:MultiplicityElement:isUnique"></ppe:BooleanRadio>
<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
<ppe:ReferenceDialog input="{Binding}" property="UML:TypedElement:type"
- customLabel="defaultEditor"></ppe:ReferenceDialog>
+ customLabel="Classic Type"></ppe:ReferenceDialog>
<ppe:CompletionStyledTextReferenceDialog
- input="{Binding}" property="UML:TypedElement:type" customLabel="newType"></ppe:CompletionStyledTextReferenceDialog>
+ input="{Binding}" property="UML:TypedElement:type" customLabel="Auto-fill Type"></ppe:CompletionStyledTextReferenceDialog>
<xtexteditor:MultiplicityXTextDialog
property="Multiplicity:multiplicity" input="{Binding}"></xtexteditor:MultiplicityXTextDialog>
<ppe:ReferenceDialog input="{Binding}"
diff --git a/examples/uml/org.eclipse.papyrus.uml.textual.editors.example/src/org/eclipse/papyrus/uml/textual/editors/example/Activator.java b/examples/uml/org.eclipse.papyrus.uml.textual.editors.example/src/org/eclipse/papyrus/uml/textual/editors/example/Activator.java
index 80446ff7d10..56a73181c8f 100644
--- a/examples/uml/org.eclipse.papyrus.uml.textual.editors.example/src/org/eclipse/papyrus/uml/textual/editors/example/Activator.java
+++ b/examples/uml/org.eclipse.papyrus.uml.textual.editors.example/src/org/eclipse/papyrus/uml/textual/editors/example/Activator.java
@@ -1,3 +1,15 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
package org.eclipse.papyrus.uml.textual.editors.example;
import org.eclipse.ui.plugin.AbstractUIPlugin;

Back to the top