Skip to content
Snippets Groups Projects
Commit 91ecbe56 authored by Andreas Wandinger's avatar Andreas Wandinger
Browse files

GREEN.

refs 667
parent dbeba599
No related branches found
No related tags found
No related merge requests found
......@@ -38,21 +38,19 @@ import org.fortiss.tooling.kernel.ui.util.EObjectSelectionUtils;
* @author hoelzl
* @author $Author$
* @version $Rev$
* @ConQAT.Rating YELLOW Hash: 532479EDC4922A50828399F6761787F3
* @ConQAT.Rating GREEN Hash: 7A7C15AC31A357240928A86A6092C7C7
*/
public abstract class TreeViewerEditorBase<T extends EObject> extends
EditorBase<T> {
public abstract class TreeViewerEditorBase<T extends EObject> extends EditorBase<T> {
/** Stores the {@link TreeViewer}. */
private TreeViewer treeViewer;
/** The adapter used for dealing with changes of the */
/** The adapter used for dealing with changes of the content. */
private final Adapter editedObjectChanged = new EContentAdapter() {
@Override
public void notifyChanged(Notification notification) {
super.notifyChanged(notification);
if (notification.getEventType() != Notification.REMOVING_ADAPTER
&& !treeViewer.getTree().isDisposed()) {
if(notification.getEventType() != Notification.REMOVING_ADAPTER && !treeViewer.getTree().isDisposed()) {
treeViewer.refresh(true);
}
}
......@@ -65,10 +63,9 @@ public abstract class TreeViewerEditorBase<T extends EObject> extends
setupTreeViewer(treeViewer);
ViewerElementCompositionDropAdapter dndAdapter = new ViewerElementCompositionDropAdapter(
treeViewer);
treeViewer.addDropSupport(dndAdapter.getSupportedDNDOperations(),
dndAdapter.getPreferredTransfers(), dndAdapter);
ViewerElementCompositionDropAdapter dndAdapter = new ViewerElementCompositionDropAdapter(treeViewer);
treeViewer.addDropSupport(dndAdapter.getSupportedDNDOperations(), dndAdapter.getPreferredTransfers(),
dndAdapter);
treeViewer.setInput(editedObject);
getEditorSite().setSelectionProvider(treeViewer);
......@@ -85,9 +82,8 @@ public abstract class TreeViewerEditorBase<T extends EObject> extends
/** Returns the elements currently selected in the tree. */
protected Collection<EObject> getTreeSelection() {
List<EObject> result = EObjectSelectionUtils
.getEObjectElements(treeViewer.getSelection());
if (result.isEmpty()) {
List<EObject> result = EObjectSelectionUtils.getEObjectElements(treeViewer.getSelection());
if(result.isEmpty()) {
result.add(editedObject);
}
return result;
......@@ -104,4 +100,5 @@ public abstract class TreeViewerEditorBase<T extends EObject> extends
public void setFocus() {
treeViewer.getTree().setFocus();
}
}
......@@ -34,7 +34,7 @@ import org.eclipse.swt.widgets.Composite;
* @author hoelzl
* @author $Author$
* @version $Rev$
* @ConQAT.Rating YELLOW Hash: A52D1443E8DA2144144AC2D83472C803
* @ConQAT.Rating GREEN Hash: 6ABDB69C13B3DC2FE1C7164F90E9C929
*/
public class TableViewerUtils {
......@@ -183,5 +183,7 @@ public class TableViewerUtils {
}
return null;
}
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment