diff options
| author | Camille Letavernier | 2014-02-14 12:05:30 +0000 |
|---|---|---|
| committer | Camille Letavernier | 2014-02-14 12:05:47 +0000 |
| commit | 244a3a949b26b2d541a00e1bd5e10ca47d64d7dc (patch) | |
| tree | 73c5197fdaf8cd96bbaee9273637a72f42a24928 /plugins/infra | |
| parent | 94427d7f1aae5b9a86be97bce050b8b30f9e9af6 (diff) | |
| parent | b0b8ee5723af195d9cf7e24d759fe864a2475aff (diff) | |
| download | org.eclipse.papyrus-244a3a949b26b2d541a00e1bd5e10ca47d64d7dc.tar.gz org.eclipse.papyrus-244a3a949b26b2d541a00e1bd5e10ca47d64d7dc.tar.xz org.eclipse.papyrus-244a3a949b26b2d541a00e1bd5e10ca47d64d7dc.zip | |
Synchronize with master
Diffstat (limited to 'plugins/infra')
2 files changed, 6 insertions, 5 deletions
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/CheckedOperationHistory.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/CheckedOperationHistory.java index 4fd07f68e65..5973347c169 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/CheckedOperationHistory.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/CheckedOperationHistory.java @@ -1,5 +1,5 @@ /*****************************************************************************
- * Copyright (c) 2011 Atos.
+ * Copyright (c) 2011, 2014 Atos, CEA, and others.
*
*
* All rights reserved. This program and the accompanying materials
@@ -9,6 +9,7 @@ *
* Contributors:
* Mathieu Velten (Atos) - Initial API and implementation
+ * Christian W. Damus (CEA) - bug 357250
*
*****************************************************************************/
package org.eclipse.papyrus.commands;
@@ -72,11 +73,11 @@ public class CheckedOperationHistory implements IOperationHistory { }
static {
- IConfigurationElement[] configElements = Platform.getExtensionRegistry().getConfigurationElementsFor("org.eclipse.papyrus.commands", "operationApprover");
+ IConfigurationElement[] configElements = Platform.getExtensionRegistry().getConfigurationElementsFor(Activator.PLUGIN_ID, "operationApprover"); //$NON-NLS-1$
List<ApproverPriorityPair> approverPriorityPairs = new LinkedList<ApproverPriorityPair>();
for(IConfigurationElement elem : configElements) {
- if("operationApprover".equals(elem.getName())) {
+ if("operationApprover".equals(elem.getName())) { //$NON-NLS-1$
try {
ApproverPriorityPair approverPriorityPair = new ApproverPriorityPair();
approverPriorityPair.approver = (IOperationApprover2)elem.createExecutableExtension("class");
@@ -84,8 +85,7 @@ public class CheckedOperationHistory implements IOperationHistory { approverPriorityPairs.add(approverPriorityPair);
} catch (Exception e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ Activator.log.error("Uncaught exception in instantiation of operation approver.", e); //$NON-NLS-1$
}
}
}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/CompositeAxisManager.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/CompositeAxisManager.java index 3e08b875465..96d79c25702 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/CompositeAxisManager.java +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/CompositeAxisManager.java @@ -171,6 +171,7 @@ public class CompositeAxisManager extends AbstractAxisManager implements ICompos */
@Override
public void dispose() {
+ super.dispose();
for(final IAxisManager current : this.subManagers) {
current.dispose();
}
|