diff options
| author | cletavernie | 2011-10-05 09:24:36 +0000 |
|---|---|---|
| committer | cletavernie | 2011-10-05 09:24:36 +0000 |
| commit | 0c840acd11e5f635d858704b3f722aacf0385367 (patch) | |
| tree | 4de34ee6be310bd4c329e55c36d15c83d3b341a6 | |
| parent | e1a0a18b1645ac9178f3bab5b36d706a661db1fd (diff) | |
| download | org.eclipse.papyrus-0c840acd11e5f635d858704b3f722aacf0385367.tar.gz org.eclipse.papyrus-0c840acd11e5f635d858704b3f722aacf0385367.tar.xz org.eclipse.papyrus-0c840acd11e5f635d858704b3f722aacf0385367.zip | |
358886: [property view] dialog box keeps recent searches and loads other models
https://bugs.eclipse.org/bugs/show_bug.cgi?id=358886
| -rw-r--r-- | plugins/uml/org.eclipse.papyrus.uml.modelexplorer.widgets/src/org/eclipse/papyrus/uml/modelexplorer/widgets/ServiceEditFilteredUMLContentProvider.java | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer.widgets/src/org/eclipse/papyrus/uml/modelexplorer/widgets/ServiceEditFilteredUMLContentProvider.java b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer.widgets/src/org/eclipse/papyrus/uml/modelexplorer/widgets/ServiceEditFilteredUMLContentProvider.java index 7b88f451225..8566ac15341 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.modelexplorer.widgets/src/org/eclipse/papyrus/uml/modelexplorer/widgets/ServiceEditFilteredUMLContentProvider.java +++ b/plugins/uml/org.eclipse.papyrus.uml.modelexplorer.widgets/src/org/eclipse/papyrus/uml/modelexplorer/widgets/ServiceEditFilteredUMLContentProvider.java @@ -20,10 +20,19 @@ public class ServiceEditFilteredUMLContentProvider extends UMLElementMEBContentP private EditServiceValidator validator;
public ServiceEditFilteredUMLContentProvider(EObject editedObject, EStructuralFeature feature, EObject semanticRoot) {
- super(semanticRoot, "history_" + feature.getEType().getEPackage().getName() + ":" + feature.getEType().getName() + ":" + feature.getName()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ super(semanticRoot, getHistoryID(editedObject, feature, semanticRoot));
validator = new EditServiceValidator(editedObject, feature);
}
+ private static String getHistoryID(EObject editedObject, EStructuralFeature feature, EObject semanticRoot) {
+ // return String.format("history_%s:%s:%s", feature.getEType().getEPackage().getName(), feature.getEType().getName(), feature.getName()); //$NON-NLS-1$
+ if(editedObject.eResource() == null) {
+ return String.format("history_%s:%s:%s", feature.getEType().getEPackage().getName(), feature.getEType().getName(), feature.getName());
+ }
+
+ return String.format("history_%s:%s:%s:%s", editedObject.eResource().getURI(), feature.getEType().getEPackage().getName(), feature.getEType().getName(), feature.getName());
+ }
+
@Override
public boolean isValidValue(Object element) {
return super.isValidValue(element) && validator.isValidValue(getAdaptedValue(element));
|