Author: max.andersen(a)jboss.com Date: 2007-11-01 17:32:09 -0400 (Thu, 01 Nov 2007) New Revision: 4649 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/editors/AdaptorFactoryProviderForServiceXML.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/editors/ServicexmlModelHandler.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/util/PackageTypeSearcher.java Log: JBIDE-737 Problems occur when CSS file is created. fixed factoryprovider for service xml so it only matches on relevant ones + comment about at least one place where the code completion is broken. Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/editors/AdaptorFactoryProviderForServiceXML.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/editors/AdaptorFactoryProviderForServiceXML.java 2007-11-01 19:57:36 UTC (rev 4648) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/editors/AdaptorFactoryProviderForServiceXML.java 2007-11-01 21:32:09 UTC (rev 4649) @@ -24,6 +24,7 @@ import org.eclipse.wst.sse.core.internal.ltk.modelhandler.IDocumentTypeHandler; import org.eclipse.wst.xml.ui.internal.registry.AdapterFactoryProviderForXML; + /** * * @author Rob Stryker <rob.stryker(a)redhat.com&gt; @@ -33,8 +34,11 @@ AdapterFactoryProviderForXML { public boolean isFor(IDocumentTypeHandler contentTypeDescription) { - //return (contentTypeDescription instanceof ServicexmlModelHandler); - return true; + if(contentTypeDescription.getId().equals(ServicexmlModelHandler.MODELHANDLER_ID)) { + return true; + } else { + return false; + } } } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/editors/ServicexmlModelHandler.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/editors/ServicexmlModelHandler.java 2007-11-01 19:57:36 UTC (rev 4648) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/editors/ServicexmlModelHandler.java 2007-11-01 21:32:09 UTC (rev 4649) @@ -37,7 +37,7 @@ public class ServicexmlModelHandler extends AbstractModelHandler implements IModelHandler{ final static String CONTENTTYPE_ID = "org.jboss.ide.eclipse.as.ui.mbeans.servicexml"; //$NON-NLS-1$ - final private static String MODELHANDLER_ID = "org.jboss.ide.eclipse.as.ui.servicexmlModelHandler"; //$NON-NLS-1$ + final static String MODELHANDLER_ID = "org.jboss.ide.eclipse.as.ui.servicexmlModelHandler"; //$NON-NLS-1$ public ServicexmlModelHandler() { super(); Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/util/PackageTypeSearcher.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/util/PackageTypeSearcher.java 2007-11-01 19:57:36 UTC (rev 4648) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/util/PackageTypeSearcher.java 2007-11-01 21:32:09 UTC (rev 4649) @@ -127,6 +127,11 @@ results.add(match.getElement()); } + @Override + public void beginReporting() { + // TODO Auto-generated method stub + super.beginReporting(); + } public void endReporting() { } @@ -151,7 +156,7 @@ {SearchEngine.getDefaultSearchParticipant()}, scope, requestor, new NullProgressMonitor()); ArrayList results = requestor.getResults(); - if (results.size() != 1) + if (results.size() != 1) // TODO: there can be multiple packagefragments for the same name in a workspace return null; return (IPackageFragment) results.get(0);