X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.workbench.search.impl%2Fsrc%2Forg%2Fsimantics%2Fworkbench%2Fsearch%2Fimpl%2FSearchServiceFactory.java;fp=bundles%2Forg.simantics.workbench%2Fsrc%2Forg%2Fsimantics%2Fworkbench%2Finternal%2Fcontributions%2Fsearch%2FSearchServiceFactory.java;h=5ad172941c2f5531443ea6425064e25bfb7e5be9;hp=ab386699cd2c1982e4468a5611df21d618ced49b;hb=38d133f2a39bab76deed5d047fbabee4479b5373;hpb=a9e5abf29200550168557ae2c7e0a6e2442f6c2b diff --git a/bundles/org.simantics.workbench/src/org/simantics/workbench/internal/contributions/search/SearchServiceFactory.java b/bundles/org.simantics.workbench.search.impl/src/org/simantics/workbench/search/impl/SearchServiceFactory.java similarity index 93% rename from bundles/org.simantics.workbench/src/org/simantics/workbench/internal/contributions/search/SearchServiceFactory.java rename to bundles/org.simantics.workbench.search.impl/src/org/simantics/workbench/search/impl/SearchServiceFactory.java index ab386699c..5ad172941 100644 --- a/bundles/org.simantics.workbench/src/org/simantics/workbench/internal/contributions/search/SearchServiceFactory.java +++ b/bundles/org.simantics.workbench.search.impl/src/org/simantics/workbench/search/impl/SearchServiceFactory.java @@ -1,4 +1,4 @@ -package org.simantics.workbench.internal.contributions.search; +package org.simantics.workbench.search.impl; import org.eclipse.core.expressions.Expression; @@ -12,9 +12,9 @@ import org.eclipse.ui.services.AbstractServiceFactory; import org.eclipse.ui.services.IServiceLocator; import org.simantics.workbench.search.ISearchService; +@SuppressWarnings("restriction") public class SearchServiceFactory extends AbstractServiceFactory { - @SuppressWarnings("rawtypes") @Override public Object create(Class serviceInterface, IServiceLocator parentLocator, @@ -27,7 +27,8 @@ public class SearchServiceFactory extends AbstractServiceFactory { if (wb == null) { return null; } - + + @SuppressWarnings("unchecked") Object parent = parentLocator.getService(serviceInterface); if (parent == null) { return new SearchServiceImpl(); @@ -42,7 +43,7 @@ public class SearchServiceFactory extends AbstractServiceFactory { Expression parentExp = ((SlaveSearchService) parent).getDefaultExpression(); return new NestableSearchService((ISearchService)parent, parentExp); } - + Expression exp = new ActivePartExpression(site.getPart()); return new SlaveSearchService((ISearchService)parent, exp); }