From a909916fa14d613ae6377b64642a5e90190d44a5 Mon Sep 17 00:00:00 2001
From: Vincent Aravantinos <aravantinos@fortiss.org>
Date: Wed, 4 Feb 2015 16:16:22 +0000
Subject: [PATCH] GREEN refs 2255
---
.../extension/IContextMenuMultiSelectionContributor.java | 2 +-
.../kernel/ui/extension/base/MultiEObjectActionBase.java | 2 +-
.../properties/ElementWithURIPropertySection.java | 2 +-
.../properties/NamedCommentedPropertySection.java | 2 +-
.../kernel/ui/internal/views/NavigatorViewPart.java | 8 +++-----
.../kernel/ui/presentation/ModelElementLabelProvider.java | 2 +-
6 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/IContextMenuMultiSelectionContributor.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/IContextMenuMultiSelectionContributor.java
index 873d3573d..c0945d797 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/IContextMenuMultiSelectionContributor.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/IContextMenuMultiSelectionContributor.java
@@ -29,7 +29,7 @@ import org.fortiss.tooling.kernel.ui.extension.data.ContextMenuContextProvider;
* @author andrei
* @author $Author: hoelzl $
* @version $Rev: 18709 $
- * @ConQAT.Rating YELLOW Hash: 687C1FBD364509EC228E05C484B78961
+ * @ConQAT.Rating GREEN Hash: 8DBD1C2C210839595BA1189417D000E9
*/
public interface IContextMenuMultiSelectionContributor extends IContextMenuContributor {
/**
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/MultiEObjectActionBase.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/MultiEObjectActionBase.java
index 816d93f5b..21e4706a4 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/MultiEObjectActionBase.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/MultiEObjectActionBase.java
@@ -29,7 +29,7 @@ import org.eclipse.jface.resource.ImageDescriptor;
* @author andrei
* @author $Author: hoelzl $
* @version $Rev: 18709 $
- * @ConQAT.Rating YELLOW Hash: A70B4A247719455AE1F30032B713C328
+ * @ConQAT.Rating GREEN Hash: 6D708A86D403756DF1FEFE8E9FF0CDC6
*/
public abstract class MultiEObjectActionBase<T extends List<? extends EObject>> extends Action {
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/properties/ElementWithURIPropertySection.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/properties/ElementWithURIPropertySection.java
index c6f944549..f54273e76 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/properties/ElementWithURIPropertySection.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/properties/ElementWithURIPropertySection.java
@@ -29,7 +29,7 @@ import org.fortiss.tooling.kernel.ui.extension.base.PropertySectionBase;
* @author ratiu
* @author $Author: ratiu $
* @version $Rev: 5274 $
- * @ConQAT.Rating YELLOW Hash: EABEEDA3A7800A65A2310FCA9D0591A4
+ * @ConQAT.Rating GREEN Hash: D27E9C6C34513AAADE71A0D3F5278643
*/
public class ElementWithURIPropertySection extends PropertySectionBase {
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/properties/NamedCommentedPropertySection.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/properties/NamedCommentedPropertySection.java
index c90aded09..e43982a63 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/properties/NamedCommentedPropertySection.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/properties/NamedCommentedPropertySection.java
@@ -38,7 +38,7 @@ import org.fortiss.tooling.kernel.ui.util.ObservableUtils;
* @author ratiu
* @author $Author$
* @version $Rev$
- * @ConQAT.Rating YELLOW Hash: 09D914F4FA7DCCCBE0AA153D9F900BCB
+ * @ConQAT.Rating GREEN Hash: 77B0B72BC66A318095811CE94FA4C407
*/
public class NamedCommentedPropertySection extends PropertySectionBase {
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/NavigatorViewPart.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/NavigatorViewPart.java
index 5e2951d92..b356440a5 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/NavigatorViewPart.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/NavigatorViewPart.java
@@ -76,7 +76,7 @@ import org.fortiss.tooling.kernel.ui.util.PropertiesConstantUtils;
* @author hoelzl
* @author $Author$
* @version $Rev$
- * @ConQAT.Rating YELLOW Hash: E0F4981C7425FF0359F123AC4ED2D94D
+ * @ConQAT.Rating GREEN Hash: 51AD30FD8F8AF4E7271D5799395647A1
*/
public final class NavigatorViewPart extends ViewPart implements ISelectionListener,
ISelectionChangedListener, ITabbedPropertySheetPageContributor, ContextMenuContextProvider,
@@ -126,18 +126,16 @@ public final class NavigatorViewPart extends ViewPart implements ISelectionListe
if(selection instanceof TreeSelection && !selection.isEmpty()) {
Object firstSelectedElement = ((TreeSelection)selection).getFirstElement();
if(firstSelectedElement instanceof EObject) {
-
// Preserve container of current element. This is required to determine a valid
// model element in case the next operation is to delete the currently selected
// element
backupElementToBeSelected = ((EObject)firstSelectedElement).eContainer();
}
} else if(backupElementToBeSelected != null) {
-
// Selection would be empty. Use backup element to force selection to the container
// of the element that has been selected last.
- viewer.setSelection(new TreeSelection(new TreePath(
- new Object[] {backupElementToBeSelected})));
+ TreePath treePath = new TreePath(new Object[] {backupElementToBeSelected});
+ viewer.setSelection(new TreeSelection(treePath));
backupElementToBeSelected = null;
}
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/presentation/ModelElementLabelProvider.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/presentation/ModelElementLabelProvider.java
index 1cdd04994..d41cdcd86 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/presentation/ModelElementLabelProvider.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/presentation/ModelElementLabelProvider.java
@@ -38,7 +38,7 @@ import org.fortiss.tooling.kernel.ui.service.IModelElementHandlerService;
* @author mou
* @author $Author$
* @version $Rev$
- * @ConQAT.Rating YELLOW Hash: C44280EF94E699B817B5F15D93E7C1A4
+ * @ConQAT.Rating GREEN Hash: 4DC8D3C0201236BB9967662CE78E405F
*/
public class ModelElementLabelProvider extends ColumnLabelProvider {
/** {@inheritDoc} */
--
GitLab