Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShuai Li2015-02-17 03:51:07 -0500
committerShuai Li2015-03-11 13:01:00 -0400
commit6bf80d55c26e444fb6da10b63fb18ec654dbbb43 (patch)
tree9d5a2bb8d83824c339db2ce4d20b347a1f8d1536 /plugins/views/org.eclipse.papyrus.views.search
parent0964d5a20f8f5cab6cd650c533b0b58e10a3c103 (diff)
downloadorg.eclipse.papyrus-6bf80d55c26e444fb6da10b63fb18ec654dbbb43.tar.gz
org.eclipse.papyrus-6bf80d55c26e444fb6da10b63fb18ec654dbbb43.tar.xz
org.eclipse.papyrus-6bf80d55c26e444fb6da10b63fb18ec654dbbb43.zip
Bug 461816 - [Search] Tooltips for buttons
- Added tooltips for refresh lists button Change-Id: Iff50437e068ebd770d476cb75f86e512b6544f65 Signed-off-by: Shuai Li <shuai.li@cea.fr>
Diffstat (limited to 'plugins/views/org.eclipse.papyrus.views.search')
-rw-r--r--plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/results/AbstractResultEntry.java10
-rw-r--r--plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/scope/ScopeEntry.java14
2 files changed, 18 insertions, 6 deletions
diff --git a/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/results/AbstractResultEntry.java b/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/results/AbstractResultEntry.java
index 248c8f3e77f..31050fa5112 100644
--- a/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/results/AbstractResultEntry.java
+++ b/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/results/AbstractResultEntry.java
@@ -115,16 +115,16 @@ public abstract class AbstractResultEntry extends Match {
ResultEntry theParent = null;
while (potentialParent != null) {
- theParent = new ResultEntry(potentialParent, scopeEntry);
- theParent.setParent(new ResultEntry(scopeEntry.getResourceURI(), scopeEntry));
-
+ if (potentialParent.eContainer() == null) {
+ theParent = new ResultEntry(potentialParent, scopeEntry);
+ theParent.setParent(new ResultEntry(scopeEntry.getResourceURI(), scopeEntry));
+ }
+
potentialParent = potentialParent.eContainer();
}
if (theParent == null) {
-
theParent = new ResultEntry(scopeEntry.getResourceURI(), scopeEntry);
-
}
return theParent;
diff --git a/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/scope/ScopeEntry.java b/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/scope/ScopeEntry.java
index 9ef2d4c0387..3e844d46bd0 100644
--- a/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/scope/ScopeEntry.java
+++ b/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/scope/ScopeEntry.java
@@ -140,7 +140,6 @@ public class ScopeEntry {
} catch (ServiceException e) {
// Create one
try {
-
modelSet = ModelUtils.openResource(getResourceURI());
getServicesRegistry().add(ModelSet.class, 10, modelSet);
getServicesRegistry().startServicesByClassKeys(ModelSet.class);
@@ -152,7 +151,20 @@ public class ScopeEntry {
Activator.log.error(e1);
}
}
+
+ /*try {
+ modelSet = ModelUtils.openResource(getResourceURI());
+ getServicesRegistry().add(ModelSet.class, 10, modelSet);
+ getServicesRegistry().startServicesByClassKeys(ModelSet.class);
+ } catch (ModelMultiException modelMultiException) {
+ Activator.log.error(Messages.ScopeEntry_1 + this.getResourceURI(), modelMultiException);
+ } catch (ServiceMultiException e1) {
+ Activator.log.error(e1);
+ } catch (ServiceNotFoundException e1) {
+ Activator.log.error(e1);
+ }*/
}
+
return modelSet;
}

Back to the top