Skip to content

Commit

Permalink
#2778 Fixed SB Label Providers
Browse files Browse the repository at this point in the history 
referencing and referenced providers were inverted

Change-Id: Icfa07a5ff4ac99b57ab99e1abca60d40cfa31687
Signed-off-by: Erwann Traisnel <erwann.traisnel@obeo.fr>
  • Loading branch information
@etraisnel2 @tguiu
etraisnel2 authored and tguiu committed Feb 5, 2024
1 parent be15618 commit 0495595
Show file tree
Hide file tree
Showing 2 changed files with 177 additions and 155 deletions.
9 changes: 4 additions & 5 deletions ...ella/core/ui/semantic/browser/label/provider/SemanticBrowserLabelProviderFactoryImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
package org.polarsys.capella.core.ui.semantic.browser.label.provider;

import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.ui.PlatformUI;
import org.polarsys.capella.common.ui.toolkit.browser.label.provider.factory.AbstractLabelProviderFactory;

public class SemanticBrowserLabelProviderFactoryImpl extends AbstractLabelProviderFactory {
Expand Down Expand Up @@ -48,21 +47,21 @@ public ILabelProvider getDiagramLabelProvider() {
}

/**
* @see org.polarsys.capella.common.ui.toolkit.browser.label.provider.factory.AbstractLabelProviderFactory#getReferencedLabelProvider()
* @see org.polarsys.capella.common.ui.toolkit.browser.label.provider.factory.AbstractLabelProviderFactory#getReferencingLabelProvider()
*/
@Override
public ILabelProvider getReferencedLabelProvider() {
public ILabelProvider getReferencingLabelProvider() {
if (null == referencingLabelProvider) {
referencingLabelProvider = new SemanticBrowserDecoratingLabelProvider(new SemanticBrowserLabelProvider());
}
return referencingLabelProvider;
}

/**
* @see org.polarsys.capella.common.ui.toolkit.browser.label.provider.factory.AbstractLabelProviderFactory#getReferencingLabelProvider()
* @see org.polarsys.capella.common.ui.toolkit.browser.label.provider.factory.AbstractLabelProviderFactory#getReferencedLabelProvider()
*/
@Override
public ILabelProvider getReferencingLabelProvider() {
public ILabelProvider getReferencedLabelProvider() {
if (null == referencedLabelProvider) {
referencedLabelProvider = new SemanticBrowserDecoratingLabelProvider(new SemanticBrowserLabelProvider());
}
Expand Down
323 changes: 173 additions & 150 deletions ...c.browser/src/org/polarsys/capella/core/ui/semantic/browser/view/SemanticBrowserTree.java
View file
Original file line number Diff line number Diff line change
@@ -1,150 +1,173 @@
/*******************************************************************************
* Copyright (c) 2006, 2020 THALES GLOBAL SERVICES.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
* http://www.eclipse.org/legal/epl-2.0
*
* SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales - initial API and implementation
*******************************************************************************/
package org.polarsys.capella.core.ui.semantic.browser.view;

import java.util.ArrayList;
import java.util.List;

import org.eclipse.jface.viewers.ColumnViewerEditor;
import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Item;
import org.eclipse.swt.widgets.Tree;
import org.eclipse.swt.widgets.TreeItem;
import org.polarsys.capella.common.ui.toolkit.browser.category.CategoryImpl;
import org.polarsys.capella.common.ui.toolkit.browser.content.provider.IBrowserContentProvider;
import org.polarsys.capella.common.ui.toolkit.browser.content.provider.wrapper.CategoryWrapper;
import org.polarsys.capella.common.ui.toolkit.browser.content.provider.wrapper.EObjectWrapper;
import org.polarsys.capella.common.ui.toolkit.browser.model.ISemanticBrowserModel;

public class SemanticBrowserTree extends TreeViewer {

protected ISemanticBrowserModel model;
protected String browserID;

public SemanticBrowserTree(Composite parent, ISemanticBrowserModel model_p, String browserID_p) {
super(parent);
browserID = browserID_p;
model = model_p;
updateAutoExpandLevel();
getTree().addListener(SWT.Expand, new TreeItemListenerForHistory(true, browserID, model, this));
getTree().addListener(SWT.Collapse, new TreeItemListenerForHistory(false, browserID, model, this));
}

protected void updateAutoExpandLevel() {
if (model.doesLimitateTreeExpansion()) {
if (browserID == IBrowserContentProvider.ID_CURRENT_CP) {
setAutoExpandLevel(3);
} else {
setAutoExpandLevel(2);
}
} else {
setAutoExpandLevel(ALL_LEVELS);
}
}

@Override
protected Item[] getSelection(Control widget) {
Item[] itemlList = ((Tree) widget).getSelection();
for (Item item : itemlList) {
Object data = item.getData();
if (data instanceof EObjectWrapper) {
EObjectWrapper wrapper = (EObjectWrapper) data;
item.setData(wrapper.getElement());
}
}
return itemlList;
}

@Override
protected ColumnViewerEditor createViewerEditor() {
// Disable ColumnViewer editing support.
return null;
}

// store complete history of expand state
protected void initializeHistory() {
model.getOrCreateHistory(browserID);// because it is possible that no save is done and table must be initialized
for (TreeItem treeItem : getAllItems()) {
if (!getExpanded(treeItem)) {
Object data = treeItem.getData();
if ((data != null) && (data instanceof CategoryWrapper)) {
CategoryImpl category = ((CategoryWrapper) data).getElement();
model.saveExpandedState(category, browserID, false);
}
}
}
}

// restore the expansion state of the given input
protected void restoreExpansionState(Object input) {
TreeItem topItem = getTree().getTopItem();
for (TreeItem treeItem : getAllItems()) {
Object data = treeItem.getData();
if (data != null) {
if (model.doesLimitateTreeExpansion()) {
if (data instanceof CategoryWrapper) {
CategoryImpl category = ((CategoryWrapper) data).getElement();
boolean expanded = model.getExpandedState(category, browserID);
treeItem.setExpanded(expanded);
} else if ((browserID == IBrowserContentProvider.ID_CURRENT_CP) && (treeItem == topItem)) {
treeItem.setExpanded(true);
} else {
treeItem.setExpanded(false);
}
}
}
}
}

@Override
protected void inputChanged(Object input, Object oldInput) {
// before tree update, we update the expansion depth and initialize history if necessary
updateAutoExpandLevel();
// we initialize history for the current tree if necessary
if (oldInput != null) {
if (!model.containsExpandedHistory(browserID)) {
initializeHistory();
}
}
super.inputChanged(input, oldInput);
// after tree update, we set the current input in the model and refresh expansion state from the history if defined
if ((input != null) && model.containsExpandedHistory(browserID)) {
restoreExpansionState(input);
}
}

// return a list of all items of tree whose data is not null
private List<TreeItem> getAllItems() {
List<TreeItem> allItems = new ArrayList<TreeItem>();
for (TreeItem item : getTree().getItems()) {
if (item.getData() != null) {
allItems.add(item);
getAllItems(item, allItems);
}
}
return allItems;
}

private void getAllItems(TreeItem currentItem, List<TreeItem> allItems) {
for (TreeItem element : currentItem.getItems()) {
if (element.getData() != null) {
allItems.add(element);
getAllItems(element, allItems);
}
}
}

}
/*******************************************************************************
* Copyright (c) 2006, 2020 THALES GLOBAL SERVICES.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
* http://www.eclipse.org/legal/epl-2.0
*
* SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Thales - initial API and implementation
*******************************************************************************/
package org.polarsys.capella.core.ui.semantic.browser.view;

import java.util.ArrayList;
import java.util.List;

import org.eclipse.jface.viewers.ColumnViewerEditor;
import org.eclipse.jface.viewers.IBaseLabelProvider;
import org.eclipse.jface.viewers.LabelProviderChangedEvent;
import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Item;
import org.eclipse.swt.widgets.Tree;
import org.eclipse.swt.widgets.TreeItem;
import org.polarsys.capella.common.ui.toolkit.browser.category.CategoryImpl;
import org.polarsys.capella.common.ui.toolkit.browser.content.provider.IBrowserContentProvider;
import org.polarsys.capella.common.ui.toolkit.browser.content.provider.wrapper.CategoryWrapper;
import org.polarsys.capella.common.ui.toolkit.browser.content.provider.wrapper.EObjectWrapper;
import org.polarsys.capella.common.ui.toolkit.browser.model.ISemanticBrowserModel;

public class SemanticBrowserTree extends TreeViewer {

protected ISemanticBrowserModel model;
protected String browserID;

public SemanticBrowserTree(Composite parent, ISemanticBrowserModel model_p, String browserID_p) {
super(parent);
browserID = browserID_p;
model = model_p;
updateAutoExpandLevel();
getTree().addListener(SWT.Expand, new TreeItemListenerForHistory(true, browserID, model, this));
getTree().addListener(SWT.Collapse, new TreeItemListenerForHistory(false, browserID, model, this));
}

protected void updateAutoExpandLevel() {
if (model.doesLimitateTreeExpansion()) {
if (browserID == IBrowserContentProvider.ID_CURRENT_CP) {
setAutoExpandLevel(3);
} else {
setAutoExpandLevel(2);
}
} else {
setAutoExpandLevel(ALL_LEVELS);
}
}

@Override
protected Item[] getSelection(Control widget) {
Item[] itemlList = ((Tree) widget).getSelection();
for (Item item : itemlList) {
Object data = item.getData();
if (data instanceof EObjectWrapper) {
EObjectWrapper wrapper = (EObjectWrapper) data;
item.setData(wrapper.getElement());
}
}
return itemlList;
}

@Override
protected ColumnViewerEditor createViewerEditor() {
// Disable ColumnViewer editing support.
return null;
}

// store complete history of expand state
protected void initializeHistory() {
model.getOrCreateHistory(browserID);// because it is possible that no save is done and table must be initialized
for (TreeItem treeItem : getAllItems()) {
if (!getExpanded(treeItem)) {
Object data = treeItem.getData();
if ((data != null) && (data instanceof CategoryWrapper)) {
CategoryImpl category = ((CategoryWrapper) data).getElement();
model.saveExpandedState(category, browserID, false);
}
}
}
}

// restore the expansion state of the given input
protected void restoreExpansionState(Object input) {
TreeItem topItem = getTree().getTopItem();
for (TreeItem treeItem : getAllItems()) {
Object data = treeItem.getData();
if (data != null) {
if (model.doesLimitateTreeExpansion()) {
if (data instanceof CategoryWrapper) {
CategoryImpl category = ((CategoryWrapper) data).getElement();
boolean expanded = model.getExpandedState(category, browserID);
treeItem.setExpanded(expanded);
} else if ((browserID == IBrowserContentProvider.ID_CURRENT_CP) && (treeItem == topItem)) {
treeItem.setExpanded(true);
} else {
treeItem.setExpanded(false);
}
}
}
}
}

@Override
protected void inputChanged(Object input, Object oldInput) {
// before tree update, we update the expansion depth and initialize history if necessary
updateAutoExpandLevel();
// we initialize history for the current tree if necessary
if (oldInput != null) {
if (!model.containsExpandedHistory(browserID)) {
initializeHistory();
}
}
super.inputChanged(input, oldInput);
// after tree update, we set the current input in the model and refresh expansion state from the history if defined
if ((input != null) && model.containsExpandedHistory(browserID)) {
restoreExpansionState(input);
}
}

// return a list of all items of tree whose data is not null
private List<TreeItem> getAllItems() {
List<TreeItem> allItems = new ArrayList<TreeItem>();
for (TreeItem item : getTree().getItems()) {
if (item.getData() != null) {
allItems.add(item);
getAllItems(item, allItems);
}
}
return allItems;
}

private void getAllItems(TreeItem currentItem, List<TreeItem> allItems) {
for (TreeItem element : currentItem.getItems()) {
if (element.getData() != null) {
allItems.add(element);
getAllItems(element, allItems);
}
}
}

@Override
protected void handleLabelProviderChanged(LabelProviderChangedEvent event) {
super.handleLabelProviderChanged(event);
Object eventTarget = event.getElement();
List<Object> additionalElements = new ArrayList<>();
for (TreeItem item : getAllItems()) {
Object target = item.getData();
if (target instanceof EObjectWrapper) {
Object wrapped = ((EObjectWrapper) target).getElement();
if (wrapped == eventTarget) {
additionalElements.add(target);
}
}
}
if (!additionalElements.isEmpty()) {
LabelProviderChangedEvent delegatedEvent = new LabelProviderChangedEvent((IBaseLabelProvider) event.getSource(),
additionalElements.toArray());
super.handleLabelProviderChanged(delegatedEvent);
}
}

}

0 comments on commit 0495595

Please sign in to comment.