diff options
| author | cletavernie | 2013-03-18 16:02:29 +0000 |
|---|---|---|
| committer | cletavernie | 2013-03-18 16:02:29 +0000 |
| commit | c5be207d20c42ae27ccdfff7a8b4dfa284153242 (patch) | |
| tree | d41d94d4869e10f73e600b2b89d87ff17ba41076 | |
| parent | fb9bc81a4c94dae8d9cf252242b74012e2cf1e8a (diff) | |
| download | org.eclipse.papyrus-c5be207d20c42ae27ccdfff7a8b4dfa284153242.tar.gz org.eclipse.papyrus-c5be207d20c42ae27ccdfff7a8b4dfa284153242.tar.xz org.eclipse.papyrus-c5be207d20c42ae27ccdfff7a8b4dfa284153242.zip | |
359808 - 400012: Resolve conflicts between the previous 3 commits
| -rw-r--r-- | plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/ModelExplorerView.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/ModelExplorerView.java b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/ModelExplorerView.java index 1bc71158cc7..f2a5fa05958 100644 --- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/ModelExplorerView.java +++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/ModelExplorerView.java @@ -383,11 +383,12 @@ public class ModelExplorerView extends CommonNavigator implements IRevealSemanti }
private void installEMFFacetTreePainter(Tree tree) {
- //Install the EMFFacet Custom Tree Painter
+ // Install the EMFFacet Custom Tree Painter
org.eclipse.papyrus.infra.emf.Activator.getDefault().getCustomizationManager().installCustomPainter(tree);
- //The EMF Facet MeasureItem Listener is incompatible with the NavigatorDecoratingLabelProvider. Remove it.
- //Symptoms: ModelElementItems with an EMF Facet Overlay have a small selection size
+ // The EMF Facet MeasureItem Listener is incompatible with the NavigatorDecoratingLabelProvider. Remove it.
+ // Symptoms: ModelElementItems with an EMF Facet Overlay have a small selection size
+ // Removal also fixes bug 400012: no scrollbar although tree is larger than visible area
Collection<Listener> listenersToRemove = new LinkedList<Listener>();
for(Listener listener : tree.getListeners(SWT.MeasureItem)) {
if(listener.getClass().getName().contains("org.eclipse.emf.facet.infra.browser.uicore.internal.CustomTreePainter")) {
|