Author: scabanovich Date: 2007-08-07 12:43:15 -0400 (Tue, 07 Aug 2007) New Revision: 2940 Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/META-INF/MANIFEST.MF trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/drop/treeviewer/model/AttributeValueResourceFactory.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/drop/treeviewer/model/RootElement.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/drop/treeviewer/ui/AttributeValueLabelProvider.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/ValueHelper.java Log: JBIDE-672 Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/META-INF/MANIFEST.MF =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/META-INF/MANIFEST.MF 2007-08-07 16:35:13 UTC (rev 2939) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/META-INF/MANIFEST.MF 2007-08-07 16:43:15 UTC (rev 2940) @@ -24,6 +24,7 @@ org.jboss.tools.common.text.xml, org.jboss.tools.common.model.ui, org.jboss.tools.jst.web, + org.jboss.tools.seam.ui, org.eclipse.jface, org.eclipse.jface.text, org.eclipse.swt, Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/drop/treeviewer/model/AttributeValueResourceFactory.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/drop/treeviewer/model/AttributeValueResourceFactory.java 2007-08-07 16:35:13 UTC (rev 2939) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/drop/treeviewer/model/AttributeValueResourceFactory.java 2007-08-07 16:43:15 UTC (rev 2940) @@ -50,6 +50,8 @@ return new JsfVariablesResourceElement(name, root); } else if(KbDinamicResource.IMAGE_FILE_TYPE.equals(type)) { return new ImageFileResourceElement(editorInput, root); + } else if("seamVariables".equals(type)) { + return new SeamVariablesResourceElement(editorInput, "Seam Variables", root); } return new UnknownAttributeValueResource("Unknown resource type: " + type, root); // throw new RuntimeException("Unknown resource type:" + type); Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/drop/treeviewer/model/RootElement.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/drop/treeviewer/model/RootElement.java 2007-08-07 16:35:13 UTC (rev 2939) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/drop/treeviewer/model/RootElement.java 2007-08-07 16:43:15 UTC (rev 2940) @@ -10,14 +10,17 @@ ******************************************************************************/ package org.jboss.tools.jst.jsp.drop.treeviewer.model; +import java.util.List; + + /** * @author Igels */ public class RootElement extends ModelElement implements IAttributeValueContainer { - private AttributeValueResource[] children; + private List<AttributeValueResource> children; - public RootElement(String name, AttributeValueResource[] children) { + public RootElement(String name, List<AttributeValueResource> children) { super(name, null); this.children = children; } @@ -26,7 +29,7 @@ * @see IAttributeValueContainer#getChildren() */ public ModelElement[] getChildren() { - return children; + return children.toArray(new AttributeValueResource[0]); } /** Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/drop/treeviewer/ui/AttributeValueLabelProvider.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/drop/treeviewer/ui/AttributeValueLabelProvider.java 2007-08-07 16:35:13 UTC (rev 2939) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/drop/treeviewer/ui/AttributeValueLabelProvider.java 2007-08-07 16:43:15 UTC (rev 2940) @@ -37,6 +37,8 @@ import org.jboss.tools.jst.jsp.drop.treeviewer.model.ManagedBeanPropertyElement; import org.jboss.tools.jst.jsp.drop.treeviewer.model.ManagedBeansPropertiesResourceElement; import org.jboss.tools.jst.jsp.drop.treeviewer.model.ModelElement; +import org.jboss.tools.jst.jsp.drop.treeviewer.model.SeamVariableElement; +import org.jboss.tools.jst.jsp.drop.treeviewer.model.SeamVariablesResourceElement; import org.jboss.tools.jst.jsp.drop.treeviewer.model.ViewActionElement; import org.jboss.tools.jst.jsp.drop.treeviewer.model.ViewActionsResorceElement; @@ -75,8 +77,11 @@ imagesPathes.put(ImageFileResourceElement.class, "images/struts/web_root.gif"); imagesPathes.put(ImageFolderElement.class, "images/file/closed_folder.gif"); imagesPathes.put(ImageFileElement.class, "images/file/unknow_file.gif"); - } + imagesPathes.put(SeamVariablesResourceElement.class, "images/seam/variables_folder.gif"); + imagesPathes.put(SeamVariableElement.class, "images/seam/variable.gif"); +} + private static Map texts = new HashMap(); static { texts.put(BundlesNameResourceElement.class, TreeViewerMessages.getString("BundlesNameResourceElement.name")); Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/ValueHelper.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/ValueHelper.java 2007-08-07 16:35:13 UTC (rev 2939) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/ValueHelper.java 2007-08-07 16:43:15 UTC (rev 2940) @@ -43,7 +43,9 @@ import org.jboss.tools.common.kb.wtp.TLDVersionHelper; import org.jboss.tools.common.kb.wtp.WtpKbConnector; import org.jboss.tools.common.model.plugin.ModelPlugin; +import org.jboss.tools.common.model.project.IPromptingProvider; import org.jboss.tools.common.model.ui.ModelUIPlugin; +import org.jboss.tools.common.model.util.ModelFeatureFactory; import org.jboss.tools.jst.jsp.support.kb.WTPTextJspKbConnector; import org.jboss.tools.jst.web.tld.TaglibMapping; import org.jboss.tools.jst.web.tld.VpeTaglibManager; @@ -51,6 +53,16 @@ public class ValueHelper { private IEditorInput editorInput = null; private WTPTextJspKbConnector wtpTextJspKbConnector = null; + + public static IPromptingProvider seamPromptingProvider; + + static { + Object o = ModelFeatureFactory.getInstance().createFeatureInstance("org.jboss.tools.seam.internal.core.el.SeamPromptingProvider"); + if(o instanceof IPromptingProvider) { + seamPromptingProvider = (IPromptingProvider)o; + } + } + // VpePageContext IVisualContext pageContext = null; WtpKbConnector pageConnector = null; @@ -87,16 +99,28 @@ public ModelElement getInitalInput(String query) { AttributeDescriptor descriptor = getAttributeDescriptor(query); - if(descriptor == null) return new RootElement("root", new AttributeValueResource[0]); + if(descriptor == null) return new RootElement("root", new ArrayList<AttributeValueResource>()); AttributeValueDescriptor[] valueDescriptors = descriptor.getValueDesriptors(); - AttributeValueResource[] elements = new AttributeValueResource[valueDescriptors.length]; + List<AttributeValueResource> elements = new ArrayList<AttributeValueResource>(); ModelElement root = new RootElement("root", elements); for (int i = 0; i < valueDescriptors.length; i++) { AttributeValueResource resource = AttributeValueResourceFactory.getInstance().createResource(editorInput, wtpTextJspKbConnector, root, valueDescriptors[i].getType()); resource.setParams(valueDescriptors[i].getParams()); resource.setQuery(query, this); - elements[i] = resource; + elements.add(resource); } + if(seamPromptingProvider != null && getFile() != null) { + Properties p = new Properties(); + p.put("file", getFile()); + List list = seamPromptingProvider.getList(null, "seam.is_seam_project", null, p); + if(list != null) { + AttributeValueResource resource = AttributeValueResourceFactory.getInstance().createResource(editorInput, wtpTextJspKbConnector, root, "seamVariables"); + + System.out.println("is seam project" + getProject()); + } else { + System.out.println("is not seam project" + getProject()); + } + } return root; } @@ -131,6 +155,11 @@ public IEditorInput getEditorInput() { return editorInput; } + + public IFile getFile() { + if(!(editorInput instanceof IFileEditorInput)) return null; + return ((IFileEditorInput)editorInput).getFile(); + } public IProject getProject() { if(!(editorInput instanceof IFileEditorInput)) return null;