Author: akazakov Date: 2007-10-18 08:50:26 -0400 (Thu, 18 Oct 2007) New Revision: 4334 Removed: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/support/kb/WTPKbdJSFIDResource.java Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/NavigationCaseHyperlink.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JSFProjectConfiguration.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/support/kb/WTPKbdActionResource.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/support/kb/WTPTextJspKbConnector.java trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/list/IWebPromptingProvider.java trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/list/WebPromptingProvider.java trunk/seam/plugins/org.jboss.tools.seam.xml.ui/plugin.properties Log: http://jira.jboss.com/jira/browse/JBIDE-1087 Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JSFProjectConfiguration.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JSFProjectConfiguration.java 2007-10-18 12:38:58 UTC (rev 4333) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JSFProjectConfiguration.java 2007-10-18 12:50:26 UTC (rev 4334) @@ -10,9 +10,11 @@ ******************************************************************************/ package org.jboss.tools.jsf.model.pv; -import java.util.*; -import org.eclipse.core.resources.IResource; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import org.eclipse.core.resources.IResource; import org.jboss.tools.common.model.XModel; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.event.XModelTreeEvent; @@ -55,13 +57,8 @@ } return treeChildren; } - + private boolean acceptChild(XModelObject object) { - String entity = object.getModelEntity().getName(); - if(entity.equals("JSFProjectShaleConfiguration")) { - XModelObject jar = object.getModel().getByPath("FileSystems/lib-shale-clay.jar"); - return jar != null; - } return true; } Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/NavigationCaseHyperlink.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/NavigationCaseHyperlink.java 2007-10-18 12:38:58 UTC (rev 4333) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/NavigationCaseHyperlink.java 2007-10-18 12:50:26 UTC (rev 4334) @@ -14,7 +14,6 @@ import org.eclipse.core.resources.IFile; import org.eclipse.jface.text.IRegion; - import org.jboss.tools.common.model.XModel; import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink; import org.jboss.tools.jsf.text.ext.JSFExtensionsPlugin; @@ -40,11 +39,7 @@ String beanName = getDocument().get(region.getOffset(), region.getLength()); Properties p = new Properties(); p.put(WebPromptingProvider.FILE, file); - if(beanName != null && beanName.startsWith("dialog:")) { - provider.getList(xModel, WebPromptingProvider.SHALE_OPEN_DIALOG, beanName, p); - } else { - provider.getList(xModel, WebPromptingProvider.JSF_OPEN_ACTION, beanName, p); - } + provider.getList(xModel, WebPromptingProvider.JSF_OPEN_ACTION, beanName, p); } catch (Exception x) { JSFExtensionsPlugin.log("", x); } Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/support/kb/WTPKbdActionResource.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/support/kb/WTPKbdActionResource.java 2007-10-18 12:38:58 UTC (rev 4333) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/support/kb/WTPKbdActionResource.java 2007-10-18 12:50:26 UTC (rev 4334) @@ -20,12 +20,10 @@ import java.util.TreeSet; import org.eclipse.ui.IEditorInput; - -import org.jboss.tools.common.model.util.XModelObjectLoaderUtil; - import org.jboss.tools.common.kb.KbDinamicResource; import org.jboss.tools.common.kb.KbIcon; import org.jboss.tools.common.kb.KbProposal; +import org.jboss.tools.common.model.util.XModelObjectLoaderUtil; import org.jboss.tools.jst.web.project.list.IWebPromptingProvider; import org.jboss.tools.jst.web.project.list.WebPromptingProvider; @@ -35,7 +33,6 @@ public class WTPKbdActionResource extends WTPKbAbstractModelResource { private String fPath; public static String SUPPORTED_ID = WebPromptingProvider.JSF_VIEW_ACTIONS; - public static String SUPPORTED_ID_SHALE = WebPromptingProvider.SHALE_VIEW_DIALOGS; public WTPKbdActionResource(IEditorInput editorInput, WTPTextJspKbConnector connector) { super(editorInput); @@ -58,14 +55,7 @@ view.put(IWebPromptingProvider.VIEW_PATH, fPath); List<Object> sourceList = fProvider.getList(fXModelObject.getModel(), SUPPORTED_ID, "", view); - if(view != null) { - List shaleDialogList = (List)fProvider.getList(fXModelObject.getModel(), SUPPORTED_ID_SHALE, "", view); - if(shaleDialogList != null) { - Iterator it = shaleDialogList.iterator(); - while(it.hasNext()) sourceList.add(it.next()); - } - } - + if (sourceList != null && !sourceList.isEmpty()) { Set<String> sorted = new TreeSet<String>(String.CASE_INSENSITIVE_ORDER); Iterator it = sourceList.iterator(); Deleted: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/support/kb/WTPKbdJSFIDResource.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/support/kb/WTPKbdJSFIDResource.java 2007-10-18 12:38:58 UTC (rev 4333) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/support/kb/WTPKbdJSFIDResource.java 2007-10-18 12:50:26 UTC (rev 4334) @@ -1,80 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Exadel, Inc. and Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.jst.jsp.support.kb; - -import java.io.InputStream; -import java.util.*; -import org.eclipse.ui.IEditorInput; -import org.jboss.tools.common.kb.*; -import org.jboss.tools.jst.jsp.JspEditorPlugin; -import org.jboss.tools.jst.web.project.list.WebPromptingProvider; - -public class WTPKbdJSFIDResource extends WTPKbAbstractModelResource { - public static String SUPPORTED_ID = WebPromptingProvider.SHALE_COMPONENTS; - - public WTPKbdJSFIDResource(IEditorInput fEditorInput) { - super(fEditorInput); - } - - public void setConstraint(String name, String value) { - } - - public void clearConstraints() { - } - - public Collection<KbProposal> queryProposal(String query) { - Collection<KbProposal> proposals = new ArrayList<KbProposal>(); - try { - if (!isReadyToUse()) return proposals; - String rQuery = getPassiveQueryPart(query); - - Set<String> sorted = new TreeSet<String>(String.CASE_INSENSITIVE_ORDER); - List beanList = fProvider.getList(fXModel, SUPPORTED_ID, "", null); - Iterator itr = beanList.iterator(); - while (itr.hasNext()) sorted.add(itr.next().toString()); - if (sorted.isEmpty()) return proposals; - Iterator it = sorted.iterator(); - while(it.hasNext()) { - String text = (String)it.next(); - if(rQuery.length() == 0 || text.startsWith(rQuery)) { - KbProposal proposal = new KbProposal(); - proposal.setLabel(text); - proposal.setReplacementString(text); - proposal.setIcon(KbIcon.ENUM_ITEM); - proposals.add(proposal); - proposal.setPosition(proposal.getReplacementString().length()); - } - } - } catch (Exception x) { - JspEditorPlugin.getPluginLog().logError(x); - } - return proposals; - } - - private String getPassiveQueryPart(String query) { - if (query == null || query.trim().length() == 0) return ""; - int startIndex = query.length(); - return query.substring(0, startIndex); - } - - public boolean isReadyToUse() { - return (fProvider != null && fXModel != null); - } - - public String getType() { - return KbDinamicResource.JSF_ID; - } - - public InputStream getInputStream() { - return null; - } - -} Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/support/kb/WTPTextJspKbConnector.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/support/kb/WTPTextJspKbConnector.java 2007-10-18 12:38:58 UTC (rev 4333) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/support/kb/WTPTextJspKbConnector.java 2007-10-18 12:50:26 UTC (rev 4334) @@ -28,24 +28,22 @@ import org.eclipse.wst.xml.core.internal.document.NodeContainer; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.NamedNodeMap; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; - import org.jboss.tools.common.kb.KbConnector; import org.jboss.tools.common.kb.KbConnectorFactory; import org.jboss.tools.common.kb.KbConnectorType; import org.jboss.tools.common.kb.KbException; import org.jboss.tools.common.kb.KbResource; import org.jboss.tools.common.kb.TagDescriptor; -import org.jboss.tools.common.model.plugin.ModelPlugin; import org.jboss.tools.jst.jsp.JspEditorPlugin; import org.jboss.tools.jst.web.tld.TaglibData; import org.jboss.tools.jst.web.tld.VpeTaglibListener; import org.jboss.tools.jst.web.tld.VpeTaglibManager; import org.jboss.tools.jst.web.tld.VpeTaglibManagerProvider; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.NamedNodeMap; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; /** * @author Jeremy @@ -71,7 +69,6 @@ private WTPKbdBeanMethodResource fBeanMethodResourceRegistered = null; private WTPKbImageFileResource fImageFileResourced = null; private WTPKbdManagedBeanNameResource fManagedBeanNameResourceRegistered = null; - private WTPKbdJSFIDResource fJSFIDResource = null; private WTPKbJsfValuesResource fJSFValuesResource = null; WTPKbdTaglibResource fTaglibResource = null; @@ -122,11 +119,6 @@ fManagedBeanNameResourceRegistered = managedBeanNameResource; registerResource(fManagedBeanNameResourceRegistered); } - WTPKbdJSFIDResource jsfIDResource = new WTPKbdJSFIDResource(editorInput); - if(jsfIDResource.isReadyToUse()) { - fJSFIDResource = jsfIDResource; - registerResource(fJSFIDResource); - } WTPKbJsfValuesResource resource = new WTPKbJsfValuesResource(editorInput, this); if(resource.isReadyToUse()) { fJSFValuesResource = resource; Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/list/IWebPromptingProvider.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/list/IWebPromptingProvider.java 2007-10-18 12:38:58 UTC (rev 4333) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/list/IWebPromptingProvider.java 2007-10-18 12:50:26 UTC (rev 4334) @@ -57,11 +57,6 @@ static String STRUTS_OPEN_TAG_LIBRARY = "struts.open.taglibrary"; static String STRUTS_OPEN_METHOD = "struts.open.method"; - static String SHALE_OPEN_COMPONENT = "shale.open.component"; - static String SHALE_COMPONENTS = "shale.components"; - static String SHALE_OPEN_DIALOG = "shale.open.dialog"; - static String SHALE_VIEW_DIALOGS = "shale.view.dialogs"; - static String PROPERTY_TYPE = "propertyType"; static String PROPERTY_BEAN_ONLY = "bean-only"; static String PARAMETER_TYPES = "parameterTypes"; // String[] Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/list/WebPromptingProvider.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/list/WebPromptingProvider.java 2007-10-18 12:38:58 UTC (rev 4333) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/list/WebPromptingProvider.java 2007-10-18 12:50:26 UTC (rev 4334) @@ -24,8 +24,7 @@ static { String[][] pns = new String[][]{ {"org.jboss.tools.jsf.model.pv.JSFPromptingProvider", "org.jboss.tools.jsf"}, - {"org.jboss.tools.struts.model.pv.StrutsPromptingProvider", "org.jboss.tools.struts"}, - {"org.jboss.tools.shale.model.pv.ShalePromptingProvider", "org.jboss.tools.shale"} + {"org.jboss.tools.struts.model.pv.StrutsPromptingProvider", "org.jboss.tools.struts"} }; List<IWebPromptingProvider> l = new ArrayList<IWebPromptingProvider>(); for (int i = 0; i < pns.length; i++) { Modified: trunk/seam/plugins/org.jboss.tools.seam.xml.ui/plugin.properties =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.xml.ui/plugin.properties 2007-10-18 12:38:58 UTC (rev 4333) +++ trunk/seam/plugins/org.jboss.tools.seam.xml.ui/plugin.properties 2007-10-18 12:50:26 UTC (rev 4334) @@ -1,6 +1,2 @@ providerName=Red Hat, Inc. -pluginName=Seam XML - -editors.shale-dialog.name=Shale Dialog Config -editors.shale-clay.name=Shale Clay Config -editors.spring-beans.name=Spring Beans Config +pluginName=Seam XML \ No newline at end of file