JBoss Tools SVN: r16589 - trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2009-07-15 23:19:28 -0400 (Wed, 15 Jul 2009)
New Revision: 16589
Modified:
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/messages.properties
Log:
JBIDE-4624: change a dispaly message of variable detail tab of property view
Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/messages.properties
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/messages.properties 2009-07-15 20:37:52 UTC (rev 16588)
+++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/messages.properties 2009-07-16 03:19:28 UTC (rev 16589)
@@ -551,7 +551,7 @@
VariableTypeSelector_Input_1=Input
VariableTypeSelector_Interface_1=&Interface
VariableTypeSelector_Interface_2=Interface\:
-VariableTypeSelector_None_1=(none)
+VariableTypeSelector_None_1=(None)
VariableTypeSelector_0=Element Type:
VariableTypeSelector_1=Message Type:
VariableTypeSelector_2=Structure:
16 years, 9 months
JBoss Tools SVN: r16582 - in trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp: outline and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-07-15 11:07:09 -0400 (Wed, 15 Jul 2009)
New Revision: 16582
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AbstractXMLContentAssistProcessor.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletPageContectAssistProcessor.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JSPDialogContentProposalProvider.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JspContentAssistProcessor.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/JSPPropertySourceAdapter.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/JSPTreeDialog.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-1826
JSPPropertySourceAdapter refactored
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AbstractXMLContentAssistProcessor.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AbstractXMLContentAssistProcessor.java 2009-07-15 15:03:22 UTC (rev 16581)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AbstractXMLContentAssistProcessor.java 2009-07-15 15:07:09 UTC (rev 16582)
@@ -77,6 +77,17 @@
return super.computeCompletionProposals(viewer, offset);
}
+ /**
+ * Helper method to reuse functionality for getting context when no proposals are needed.
+ * @param viewer
+ * @param offset
+ */
+ public void createContext(ITextViewer viewer, int offset) {
+ this.fDocument = (viewer == null ? null : viewer.getDocument());
+ this.fDocumentPosition = offset;
+ this.fContext = createContext();
+ }
+
/*
* (non-Javadoc)
* @see org.eclipse.wst.xml.ui.internal.contentassist.AbstractContentAssistProcessor#computeContextInformation(org.eclipse.jface.text.ITextViewer, int)
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletPageContectAssistProcessor.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletPageContectAssistProcessor.java 2009-07-15 15:03:22 UTC (rev 16581)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletPageContectAssistProcessor.java 2009-07-15 15:07:09 UTC (rev 16582)
@@ -169,7 +169,7 @@
* @see org.jboss.tools.jst.jsp.contentassist.JspContentAssistProcessor#getContext()
*/
@Override
- protected IFaceletPageContext getContext() {
+ public IFaceletPageContext getContext() {
return (IFaceletPageContext)super.getContext();
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JSPDialogContentProposalProvider.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JSPDialogContentProposalProvider.java 2009-07-15 15:03:22 UTC (rev 16581)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JSPDialogContentProposalProvider.java 2009-07-15 15:07:09 UTC (rev 16582)
@@ -71,8 +71,9 @@
if(valueHelper == null) {
valueHelper = new ValueHelper();
}
+// pageContext = (IPageContext)context.get("pageContext");
processor = valueHelper.isFacetets() ? new FaceletPageContectAssistProcessor() : new JspContentAssistProcessor();
- processor.computeCompletionProposals(getTextViewer(), offset);
+ processor.createContext(getTextViewer(), offset);
pageContext = processor.getContext();
context.put("pageContext", pageContext);
context.put("kbQuery", createKbQuery(Type.ATTRIBUTE_VALUE, "", "", offset, false));
@@ -189,6 +190,7 @@
return elrfm.getResolvers(resource);
}
+ //TODO move to helper
protected ITextViewer getTextViewer() {
IEditorPart editor = ModelUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
if(editor == null) return null;
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JspContentAssistProcessor.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JspContentAssistProcessor.java 2009-07-15 15:03:22 UTC (rev 16581)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JspContentAssistProcessor.java 2009-07-15 15:07:09 UTC (rev 16582)
@@ -234,7 +234,7 @@
* @return
*/
@Override
- protected IPageContext getContext() {
+ public IPageContext getContext() {
return (IPageContext)super.getContext();
}
@@ -247,7 +247,7 @@
* @return
*/
@Override
- protected String getUri(String prefix) {
+ public String getUri(String prefix) {
if (prefix == null || prefix.length() == 0)
return null;
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/JSPPropertySourceAdapter.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/JSPPropertySourceAdapter.java 2009-07-15 15:03:22 UTC (rev 16581)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/JSPPropertySourceAdapter.java 2009-07-15 15:07:09 UTC (rev 16582)
@@ -19,6 +19,8 @@
import java.util.Set;
import java.util.Stack;
+import org.eclipse.jface.text.ITextViewer;
+import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.views.properties.IPropertyDescriptor;
import org.eclipse.ui.views.properties.IPropertySheetEntry;
import org.eclipse.ui.views.properties.IPropertySource;
@@ -34,14 +36,23 @@
import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
import org.eclipse.wst.xml.core.internal.document.DocumentTypeAdapter;
import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
import org.eclipse.wst.xml.ui.internal.XMLUIMessages;
import org.eclipse.wst.xml.ui.internal.properties.EnumeratedStringPropertyDescriptor;
-import org.jboss.tools.common.kb.AttributeDescriptor;
-import org.jboss.tools.common.kb.TagDescriptor;
+import org.jboss.tools.common.model.ui.ModelUIPlugin;
import org.jboss.tools.jst.jsp.JspEditorPlugin;
+import org.jboss.tools.jst.jsp.contentassist.FaceletPageContectAssistProcessor;
import org.jboss.tools.jst.jsp.contentassist.FaceletsHtmlContentAssistProcessor;
+import org.jboss.tools.jst.jsp.contentassist.JspContentAssistProcessor;
import org.jboss.tools.jst.jsp.editor.IVisualController;
+import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
+import org.jboss.tools.jst.web.kb.IPageContext;
+import org.jboss.tools.jst.web.kb.KbQuery;
+import org.jboss.tools.jst.web.kb.PageProcessor;
+import org.jboss.tools.jst.web.kb.KbQuery.Type;
+import org.jboss.tools.jst.web.kb.taglib.IAttribute;
+import org.jboss.tools.jst.web.kb.taglib.IComponent;
import org.w3c.dom.Attr;
import org.w3c.dom.DOMException;
import org.w3c.dom.Document;
@@ -64,6 +75,9 @@
private boolean fCaseSensitive = true;
private IPropertyDescriptor[] fDescriptors = null;
private ValueHelper valueHelper = new ValueHelper();
+ IPageContext pageContext;
+ int offset = 0;
+ KbQuery kbQuery;
private Set attributeNames = new HashSet();
public JSPPropertySourceAdapter(INodeNotifier target) {
@@ -87,8 +101,24 @@
if (adapter != null)
fCaseSensitive = adapter.getTagNameCase() == DocumentTypeAdapter.STRICT_CASE;
}
+ offset = ((IDOMElement)fNode).getStartOffset() + ("" + fNode.getNodeType()).length();
+ JspContentAssistProcessor processor = valueHelper.isFacetets() ? new FaceletPageContectAssistProcessor() : new JspContentAssistProcessor();
+ processor.createContext(getTextViewer(), offset);
+ pageContext = processor.getContext();
+ kbQuery = createKbQueryForNode(processor, Type.ATTRIBUTE_NAME, "zzzzzz", "zzzzzz", offset);
}
+ //TODO move to helper
+ protected ITextViewer getTextViewer() {
+ IEditorPart editor = ModelUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
+ if(editor == null) return null;
+ if (editor instanceof JSPMultiPageEditor) {
+ JSPMultiPageEditor jsp = (JSPMultiPageEditor)editor;
+ return jsp.getSourceEditor().getTextViewer();
+ }
+ return null;
+ }
+
public void setSorter(AttributeSorter sorter) {
this.sorter = sorter;
}
@@ -144,7 +174,36 @@
List<String> names = new ArrayList<String>();
List<String> namesLow = new ArrayList<String>();
IPropertyDescriptor descriptor;
-
+
+ IComponent[] components = PageProcessor.getInstance().getComponents(kbQuery, pageContext);
+
+ if(components != null && components.length != 0) {
+ for (IComponent component: components) {
+ IAttribute[] list = component.getAttributes();
+ for (IAttribute d: list) {
+ descriptor = null;
+ String attrName = d.getName();
+ if (fCaseSensitive) {
+ if (names.contains(attrName)) continue;
+ } else {
+ if (namesLow.contains(attrName.toLowerCase())) continue;
+ }
+ if(valueHelper.isAvailable(getQuery(attrName))
+ || attrName.equals("style")
+ || attrName.equals("class")) {
+ descriptor = createJSPPropertyDescriptor(d, attrName, false);
+ } else {
+ descriptor = createTextPropertyDescriptor(attrName, CATEGORY_ATTRIBUTES, 0);
+ }
+ if (descriptor != null) {
+ names.add(attrName);
+ namesLow.add(attrName.toLowerCase());
+ descriptorList.add(descriptor);
+ }
+ }
+ }
+ }
+/*
TagDescriptor td = valueHelper.getTagDescriptor("/" + fNode.getNodeName());
if(td != null) {
List list = td.getAttributesDescriptors();
@@ -171,7 +230,7 @@
}
}
}
-
+*/
// add descriptors for existing attributes
NamedNodeMap attributes = fNode.getAttributes();
if (attributes != null) {
@@ -202,8 +261,10 @@
if (attrDecl != null) {
descriptor = createPropertyDescriptor(attrDecl);
if(descriptor instanceof TextPropertyDescriptor) {
- if(valueHelper.isAvailable(getQuery(attr))) {
- descriptor = createJSPPropertyDescriptor(getQuery(attr), attr.getName(), false);
+ IAttribute a = findAttribute(components, attrName);
+ if(valueHelper.isAvailable(getQuery(attr)) && a != null) {
+ descriptor = createJSPPropertyDescriptor(a, attr.getName(), false);
+// descriptor = createJSPPropertyDescriptor(getQuery(attr), attr.getName(), false);
}
}
if (descriptor != null) {
@@ -212,8 +273,10 @@
}
}
else {
- if(valueHelper.isAvailable(getQuery(attr))) {
- descriptor = createJSPPropertyDescriptor(getQuery(attr), attr.getName(), false);
+ IAttribute a = findAttribute(components, attrName);
+ if(valueHelper.isAvailable(getQuery(attr)) && a != null) {
+ descriptor = createJSPPropertyDescriptor(a, attr.getName(), false);
+// descriptor = createJSPPropertyDescriptor(getQuery(attr), attr.getName(), false);
} else {
descriptor = createDefaultPropertyDescriptor(attr.getName(), false);
}
@@ -239,8 +302,10 @@
}
IPropertyDescriptor holdDescriptor = createPropertyDescriptor(attrDecl);
if(holdDescriptor instanceof TextPropertyDescriptor) {
- if(valueHelper.isAvailable(query)) {
- holdDescriptor = createJSPPropertyDescriptor(query, attrDecl.getAttrName(), false);
+ IAttribute a = findAttribute(components, attrDecl.getAttrName());
+ if(valueHelper.isAvailable(query) && a != null) {
+ holdDescriptor = createJSPPropertyDescriptor(a, attrDecl.getAttrName(), false);
+// holdDescriptor = createJSPPropertyDescriptor(query, attrDecl.getAttrName(), false);
}
}
if (holdDescriptor != null) {
@@ -255,6 +320,30 @@
return descriptors;
}
+ protected KbQuery createKbQueryForNode(JspContentAssistProcessor processor, Type type, String query, String stringQuery, int pos) {
+ KbQuery kbQuery = new KbQuery();
+
+ String[] parentTags = processor.getParentTags(false);
+// parentTags = add(parentTags, nodeName);
+ kbQuery.setPrefix(getPrefix());
+ kbQuery.setUri(processor.getUri(getPrefix()));
+ kbQuery.setParentTags(parentTags);
+ kbQuery.setParent(fNode.getNodeName());
+ kbQuery.setMask(true);
+ kbQuery.setType(type);
+ kbQuery.setOffset(pos);
+ kbQuery.setValue(query);
+ kbQuery.setStringQuery(stringQuery);
+
+ return kbQuery;
+ }
+
+ private String getPrefix() {
+ int i = fNode.getNodeName().indexOf(':');
+ return i < 0 ? null : fNode.getNodeName().substring(0, i);
+ }
+
+
private String getCategory(CMAttributeDeclaration attrDecl) {
if (attrDecl != null) {
if (attrDecl.supports("category")) {
@@ -274,7 +363,7 @@
}
return null;
}
-
+/*
private IPropertyDescriptor createJSPPropertyDescriptor(String query, String attributeName, boolean hideOnFilter) {
AttributeDescriptor d = valueHelper.getAttributeDescriptor(query);
return createJSPPropertyDescriptor(d, attributeName, hideOnFilter);
@@ -296,6 +385,24 @@
descriptor.setDescription(attributeName);
return descriptor;
}
+*/
+ private IPropertyDescriptor createJSPPropertyDescriptor(IAttribute d, String attributeName, boolean hideOnFilter) {
+ if(d != null && sorter != null) {
+ if(d.isRequired()) sorter.setWeight(attributeName, 2);
+ else if(d.isPreferable()) sorter.setWeight(attributeName, 1);
+ else sorter.setWeight(attributeName, 0);
+ }
+ Properties context = new Properties();
+ context.put("node", fNode);
+ context.setProperty("nodeName", fNode.getNodeName());
+ context.setProperty("attributeName", attributeName);
+ context.put("valueHelper", valueHelper);
+ context.put("pageContext", pageContext);
+ JSPPropertyDescriptor descriptor = new JSPPropertyDescriptor(context, attributeName, attributeName);
+ descriptor.setCategory(getCategory(null));
+ descriptor.setDescription(attributeName);
+ return descriptor;
+ }
private IPropertyDescriptor createDefaultPropertyDescriptor(String attributeName, boolean hideOnFilter) {
// The descriptor class used here is also used in
@@ -331,9 +438,20 @@
return changed;
}
+ private IAttribute findAttribute(IComponent[] components, String attrName) {
+ for (IComponent component: components) {
+ IAttribute a = component.getAttribute(attrName);
+ if(a != null) return a;
+ }
+ return null;
+ }
+
protected void updatePropertyDescriptors() {
if (fDescriptors == null || fDescriptors.length == 0) return;
+ IComponent[] components = PageProcessor.getInstance().getComponents(kbQuery, pageContext);
+
+
// List of all names encountered in the tag and defined by the element
List<String> declaredNames = new ArrayList<String>();
// New descriptor list that will become fDescriptors after all
@@ -374,8 +492,10 @@
else if (validValues != null && validValues.length > 0) {
fDescriptors[j] = createPropertyDescriptor(attrDecl);
if(fDescriptors[j] instanceof TextPropertyDescriptor) {
- if(valueHelper.isAvailable(query)) {
- fDescriptors[j] = createJSPPropertyDescriptor(query, attrDecl.getAttrName(), false);
+ IAttribute a = findAttribute(components, attrName);
+ if(valueHelper.isAvailable(query) && a != null) {
+ fDescriptors[j] = createJSPPropertyDescriptor(a, attrDecl.getAttrName(), false);
+// fDescriptors[j] = createJSPPropertyDescriptor(query, attrDecl.getAttrName(), false);
}
}
}
@@ -422,8 +542,10 @@
if (!descriptorNames.contains(attrName)) {
IPropertyDescriptor descriptor = createPropertyDescriptor(attrDecl);
if(descriptor instanceof TextPropertyDescriptor) {
- if(valueHelper.isAvailable(query)) {
- descriptor = createJSPPropertyDescriptor(query, attrDecl.getAttrName(), false);
+ IAttribute a = findAttribute(components, attrName);
+ if(valueHelper.isAvailable(query) && a != null) {
+ descriptor = createJSPPropertyDescriptor(a, attrDecl.getAttrName(), false);
+// descriptor = createJSPPropertyDescriptor(query, attrDecl.getAttrName(), false);
}
}
if (descriptor != null) {
@@ -440,8 +562,10 @@
descriptorNamesLow.add(attrName.toLowerCase());
IPropertyDescriptor descriptor = createPropertyDescriptor(attrDecl);
if(descriptor instanceof TextPropertyDescriptor) {
- if(valueHelper.isAvailable(query)) {
- descriptor = createJSPPropertyDescriptor(query, attrDecl.getAttrName(), false);
+ IAttribute a = findAttribute(components, attrName);
+ if(valueHelper.isAvailable(query) && a != null) {
+ descriptor = createJSPPropertyDescriptor(a, attrDecl.getAttrName(), false);
+// descriptor = createJSPPropertyDescriptor(query, attrDecl.getAttrName(), false);
}
}
if (descriptor != null) {
@@ -454,6 +578,40 @@
}
}
+ if(components != null && components.length != 0) {
+ for (int i = 0; i < fDescriptors.length; i++) {
+ if (fDescriptors[i] != null) {
+ String descriptorName = fDescriptors[i].getId().toString();
+ if (components[0].getAttribute(descriptorName) != null && !descriptorNames.contains(descriptorName)) {
+ descriptorNames.add(descriptorName);
+ descriptorNamesLow.add(descriptorName.toLowerCase());
+ descriptors.add(fDescriptors[i]);
+ }
+ }
+ }
+ for (IComponent component: components) {
+ IAttribute[] list = component.getAttributes();
+ for (IAttribute d: list) {
+ String attrName = d.getName();
+ if (fCaseSensitive) {
+ if (descriptorNames.contains(attrName)) continue;
+ } else {
+ boolean exists = descriptorNamesLow.contains(attrName.toLowerCase());
+ if (exists) continue;
+ }
+ descriptorNames.add(attrName);
+ descriptorNamesLow.add(attrName.toLowerCase());
+ IPropertyDescriptor descriptor = null;
+ if(valueHelper.isAvailable(getQuery(attrName))) {
+ descriptor = createJSPPropertyDescriptor(d, attrName, false);
+ } else {
+ descriptor = createTextPropertyDescriptor(attrName, CATEGORY_ATTRIBUTES, 0);
+ }
+ descriptors.add(descriptor);
+ }
+ }
+ }
+/*
TagDescriptor td = valueHelper.getTagDescriptor("/" + fNode.getNodeName());
if(td != null) {
for (int i = 0; i < fDescriptors.length; i++) {
@@ -487,7 +645,7 @@
descriptors.add(descriptor);
}
}
-
+*/
// Add descriptors for existing attributes that don't already have one
if (attributes != null) {
for (int i = 0; i < attributes.getLength(); i++) {
@@ -580,8 +738,10 @@
}
boolean isRequiredAttribute(String attributeName) {
- String query = getQuery(attributeName);
- AttributeDescriptor d = valueHelper.getAttributeDescriptor(query);
+ IComponent[] components = PageProcessor.getInstance().getComponents(kbQuery, pageContext);
+ IAttribute d = findAttribute(components, attributeName);
+// String query = getQuery(attributeName);
+// AttributeDescriptor d = valueHelper.getAttributeDescriptor(query);
if(d == null) return false; // do not remove unknown attribute? Remove it!
return d.isRequired();
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/JSPTreeDialog.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/JSPTreeDialog.java 2009-07-15 15:03:22 UTC (rev 16581)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/JSPTreeDialog.java 2009-07-15 15:07:09 UTC (rev 16582)
@@ -30,6 +30,10 @@
import org.jboss.tools.jst.jsp.drop.treeviewer.ui.AttributeValueContentProvider;
import org.jboss.tools.jst.jsp.drop.treeviewer.ui.AttributeValueLabelProvider;
import org.jboss.tools.jst.jsp.drop.treeviewer.ui.AttributeValueSorter;
+import org.jboss.tools.jst.web.kb.IPageContext;
+import org.jboss.tools.jst.web.kb.KbQuery;
+import org.jboss.tools.jst.web.kb.PageProcessor;
+import org.jboss.tools.jst.web.kb.taglib.IAttribute;
/**
* @author Kabanovich
@@ -76,6 +80,11 @@
String query = context.getProperty("query");
//ValueHelper valueHelper = (ValueHelper)context.get("valueHelper");
+ IPageContext pageContext = (IPageContext)context.get("pageContext");
+ KbQuery kbQuery = (KbQuery)context.get("kbQuery");
+ IAttribute[] attrs = PageProcessor.getInstance().getAttributes(kbQuery, pageContext);
+
+
ValueHelper valueHelper = new ValueHelper();
root = valueHelper.getInitalInput(query);
treeViewer.setInput(root);
16 years, 9 months
JBoss Tools SVN: r16581 - branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2009-07-15 11:03:22 -0400 (Wed, 15 Jul 2009)
New Revision: 16581
Modified:
branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathModel.java
Log:
fix for compilation errors
[javac] 1. ERROR in /home/hudson/hudson_workspace/workspace/jbosstools-nightly-3.0.x/jbds-build/eclipse/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathModel.java (at line 59)
[java] [javac] private static final Strinhg CATEGORY_LIST =
[java] [javac] ^^^^^^^
[java] [javac] Strinhg cannot be resolved to a type
Modified: branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathModel.java
===================================================================
--- branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathModel.java 2009-07-15 14:01:47 UTC (rev 16580)
+++ branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathModel.java 2009-07-15 15:03:22 UTC (rev 16581)
@@ -56,7 +56,7 @@
public static final String EMPTY_STRING = "org.jboss.ide.eclipse.as.core.model.descriptor.EmptyString";
public static final String PORTS_CATEGORY_NAME = "Ports";
private static final String DELIMITER = ",";
- private static final Strinhg CATEGORY_LIST =
+ private static final String CATEGORY_LIST =
"org.jboss.ide.eclipse.as.core.model.descriptor.Categories";
private static final String QUERY_LIST =
"org.jboss.ide.eclipse.as.core.model.descriptor.QueryList";
16 years, 9 months
JBoss Tools SVN: r16580 - trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench.
by jbosstools-commits＠lists.jboss.org
Author: vyemialyanchyk
Date: 2009-07-15 10:01:47 -0400 (Wed, 15 Jul 2009)
New Revision: 16580
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/DeferredContentProvider.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4622 - add icon for "Pending..." tree item
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/DeferredContentProvider.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/DeferredContentProvider.java 2009-07-15 13:02:21 UTC (rev 16579)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/DeferredContentProvider.java 2009-07-15 14:01:47 UTC (rev 16580)
@@ -23,12 +23,16 @@
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.Platform;
+import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.AbstractTreeViewer;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.ui.model.BaseWorkbenchContentProvider;
import org.eclipse.ui.model.IWorkbenchAdapter;
import org.eclipse.ui.progress.DeferredTreeContentManager;
import org.eclipse.ui.progress.IDeferredWorkbenchAdapter;
+import org.eclipse.ui.progress.PendingUpdateAdapter;
+import org.hibernate.console.ImageConstants;
+import org.hibernate.eclipse.console.utils.EclipseImages;
public class DeferredContentProvider extends BaseWorkbenchContentProvider {
@@ -39,14 +43,7 @@
*/
public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
if (viewer instanceof AbstractTreeViewer) {
- manager = new DeferredTreeContentManager(this, (AbstractTreeViewer) viewer) {
- protected IDeferredWorkbenchAdapter getAdapter(Object element) {
- if (element instanceof IDeferredWorkbenchAdapter)
- return (IDeferredWorkbenchAdapter) element;
- Object adapter = Platform.getAdapterManager().getAdapter(element,IDeferredWorkbenchAdapter.class);
- return (IDeferredWorkbenchAdapter) adapter;
- }
- };
+ manager = new DeferredTreeContentManagerImpl((AbstractTreeViewer) viewer);
}
super.inputChanged(viewer, oldInput, newInput);
}
@@ -85,4 +82,26 @@
return (IWorkbenchAdapter) Platform.getAdapterManager().getAdapter(o, IWorkbenchAdapter.class);
}
}
+
+ private class DeferredTreeContentManagerImpl extends DeferredTreeContentManager {
+ public DeferredTreeContentManagerImpl(AbstractTreeViewer viewer) {
+ super(viewer);
+ }
+
+ protected IDeferredWorkbenchAdapter getAdapter(Object element) {
+ if (element instanceof IDeferredWorkbenchAdapter) {
+ return (IDeferredWorkbenchAdapter) element;
+ }
+ Object adapter = Platform.getAdapterManager().getAdapter(element, IDeferredWorkbenchAdapter.class);
+ return (IDeferredWorkbenchAdapter) adapter;
+ }
+
+ protected PendingUpdateAdapter createPendingUpdateAdapter() {
+ return new PendingUpdateAdapter() {
+ public ImageDescriptor getImageDescriptor(Object object) {
+ return EclipseImages.getImageDescriptor(ImageConstants.RELOAD);
+ }
+ };
+ }
+ }
}
16 years, 9 months
JBoss Tools SVN: r16579 - in trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor: template and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2009-07-15 09:02:21 -0400 (Wed, 15 Jul 2009)
New Revision: 16579
Removed:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/custom/CustomTLDData.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/custom/CustomTLDParser.java
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/custom/CustomTLDReference.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3197
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2009-07-15 09:56:07 UTC (rev 16578)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2009-07-15 13:02:21 UTC (rev 16579)
@@ -255,7 +255,7 @@
}
sourceModel.addModelLifecycleListener(this);
- IEditorInput editorInput = pageContext.getEditPart().getEditorInput();
+// IEditorInput editorInput = pageContext.getEditPart().getEditorInput();
//commented by Maksim Areshkau, as fix for https://jira.jboss.org/jira/browse/JBIDE-4534
// if(editorInput instanceof IFileEditorInput) {
// XModel xm = null;
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java 2009-07-15 09:56:07 UTC (rev 16578)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java 2009-07-15 13:02:21 UTC (rev 16579)
@@ -385,15 +385,17 @@
}
String sourceNodeUri = sourceNodeTaglib.getUri();
- if(sourceNodeUri!=null && CustomTLDReference.isExistInCustomTlds(pageContext,sourceNodeUri)){
- return VpeTemplateManager.CUSTOM_TEMPLATE_NAME;
- }
+
String templateTaglibPrefix = getTemplateTaglibPrefix(sourceNodeUri);
if(templateTaglibPrefix != null) {
return templateTaglibPrefix + ":" + sourceNode.getLocalName(); //$NON-NLS-1$
}
+
+ if(sourceNodeUri!=null && CustomTLDReference.isExistInCustomTlds(pageContext,sourceNodeUri)){
+ return VpeTemplateManager.CUSTOM_TEMPLATE_NAME;
+ }
return null;
default :
return null;
Deleted: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/custom/CustomTLDData.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/custom/CustomTLDData.java 2009-07-15 09:56:07 UTC (rev 16578)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/custom/CustomTLDData.java 2009-07-15 13:02:21 UTC (rev 16579)
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007-2008 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
- *
- * Contributor:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.vpe.editor.template.custom;
-
-import org.eclipse.core.runtime.IPath;
-
-/**
- * Class which contains information about
- * @author mareshkau
- *
- */
-public class CustomTLDData {
-
- private IPath tldFilePath;
- private String namespace;
-
- /**
- *
- * @param tldFilePath
- */
- public CustomTLDData(IPath tldFilePath, String namespace) {
- this.tldFilePath=tldFilePath;
- this.namespace=namespace;
- }
-
- /**
- * @return the tldFilePath
- */
- public IPath getTldFilePath() {
- return this.tldFilePath;
- }
-
- /**
- * @return the namespace
- */
- public String getNamespace() {
- return this.namespace;
- }
-
-}
Deleted: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/custom/CustomTLDParser.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/custom/CustomTLDParser.java 2009-07-15 09:56:07 UTC (rev 16578)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/custom/CustomTLDParser.java 2009-07-15 13:02:21 UTC (rev 16579)
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007-2008 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
- *
- * Contributor:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.vpe.editor.template.custom;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.jboss.tools.vpe.VpePlugin;
-import org.jboss.tools.vpe.editor.template.VpeCreatorUtil;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-
-/**
- *
- * Class which created for parsing custom class definitions
- * @author mareshkau
- *
- */
-public class CustomTLDParser {
-
- private static final String NAMESPACE="namespace"; //$NON-NLS-1$
- private static final String TAG="tag"; //$NON-NLS-1$
- private static final String TAG_NAME="tag-name"; //$NON-NLS-1$
- private static final String SOURCE="source"; //$NON-NLS-1$
-
- /**
- * Looks for namespace, defined for custom template definition file
- *
- * @param absolute path for template definition file
- * @return namespace element if such was founded or null otherwise
- */
- public static final String getNameSpace(IPath pathToFile){
-
- IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(pathToFile);
- if(file!=null && file.exists()) {
- Document document=null;
- try {
- document = VpeCreatorUtil.getDocumentForRead(file);
- Element rootElement = document.getDocumentElement();
- NodeList nodeList = rootElement.getElementsByTagName(NAMESPACE);
- return nodeList.item(0).getFirstChild().getNodeValue();
- } finally {
- if(document!=null) {
- VpeCreatorUtil.releaseDocumentFromRead(document);
- }
- }
- }
- return null;
- }
- /**
- * Looks for source value like in example bellow
- <tag>
- <tag-name>paginator</tag-name>
- <source>components/paginator.xhtml</source>
- </tag>
- * @param pathToFile
- * @param name of tag
- * @return source value if exists or null otherwise
- */
- public static final String getSourceValuetInTag(IPath pathToFile, String name){
- IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(pathToFile);
- Document document=null;
- if(file!=null &&file.exists()) {
- try{
- document= VpeCreatorUtil.getDocumentForRead(file);
- Element rootElement = document.getDocumentElement();
- NodeList nodeList = rootElement.getElementsByTagName(TAG);
- for(int i=0;i<nodeList.getLength();i++) {
- Node child = nodeList.item(i);
- if(!(child instanceof Element)) {
- continue;
- }
- NodeList tagsList =((Element)child).getElementsByTagName(TAG_NAME);
- for(int j=0;j<tagsList.getLength();j++) {
- if(name.equals(tagsList.item(j).getFirstChild().getNodeValue())){
- NodeList sourceList =((Element)child).getElementsByTagName(SOURCE);
- //no source element has been founded
- if(sourceList.getLength()==0) {
- return null;
- }
- return sourceList.item(0).getFirstChild().getNodeValue();
- }
- }
- }
-
- } finally {
- if(document!=null) {
- VpeCreatorUtil.releaseDocumentFromRead(document);
- }
- }
- }
- return null;
- }
-}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/custom/CustomTLDReference.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/custom/CustomTLDReference.java 2009-07-15 09:56:07 UTC (rev 16578)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/custom/CustomTLDReference.java 2009-07-15 13:02:21 UTC (rev 16579)
@@ -10,24 +10,20 @@
******************************************************************************/
package org.jboss.tools.vpe.editor.template.custom;
-import java.util.HashMap;
+
import java.util.List;
-import java.util.Map;
-import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IFileEditorInput;
import org.jboss.tools.common.model.XModel;
import org.jboss.tools.common.model.XModelObject;
+import org.jboss.tools.common.model.filesystems.impl.SimpleFileImpl;
import org.jboss.tools.common.model.project.IModelNature;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
-import org.jboss.tools.jst.web.model.helpers.WebAppHelper;
+import org.jboss.tools.jst.web.project.WebProject;
import org.jboss.tools.jst.web.tld.TaglibData;
import org.jboss.tools.vpe.editor.context.VpePageContext;
-import org.jboss.tools.vpe.editor.util.VpeStyleUtil;
import org.jboss.tools.vpe.editor.util.XmlUtil;
import org.w3c.dom.Node;
@@ -39,12 +35,9 @@
*/
public class CustomTLDReference {
- private static final String FACELETS_LIBS_PARAMETER = "facelets.LIBRARIES"; //$NON-NLS-1$
-
- private static final String PARAM_VALUE = "param-value"; //$NON-NLS-1$
-
/**
- * Returns absolute path to custom template file, if such exist or null otherwise
+ * Returns absolute path to custom template file, if such exist or null
+ * otherwise
*
* @param sourceNode
* @return full path to custom template if exist or null if not exist
@@ -56,99 +49,66 @@
TaglibData sourceNodeTaglib = XmlUtil.getTaglibForPrefix(sourceNode
.getPrefix(), taglibs);
String uri = sourceNodeTaglib.getUri();
- CustomTLDData customTLDData = getCustomTLDDataMap(pageContext).get(uri);
- if (customTLDData == null) {
- return null;
+ XModelObject xmodel = getCustomTaglibObject(pageContext,uri);
+
+ XModelObject o = xmodel.getChildByPath(sourceNode.getLocalName()
+ + "/declaration"); //$NON-NLS-1$
+ String sourceAttributeValue = null;
+ if (o != null) {
+ sourceAttributeValue = o.getAttributeValue("source"); //$NON-NLS-1$
}
- IPath pathToSourceFile = customTLDData.getTldFilePath();
- pathToSourceFile = pathToSourceFile.removeLastSegments(1);
- String sourceParamValue = CustomTLDParser.getSourceValuetInTag(
- customTLDData.getTldFilePath(), sourceNode.getLocalName());
- if (sourceParamValue == null) {
+
+ if (sourceAttributeValue == null) {
return null;
}
- pathToSourceFile = pathToSourceFile.append(sourceParamValue);
- return pathToSourceFile;
+ if (xmodel instanceof SimpleFileImpl) {
+ IPath pathToSourceFile = ((SimpleFileImpl) xmodel).getFile()
+ .getFullPath();
+ // pathToSourceFile now smth like this
+ // /customFaceletsTestProject/WebContent/tags/facelets.taglib.xml
+ // so we remove facelet taglib name now
+ pathToSourceFile = pathToSourceFile.removeLastSegments(1);
+ pathToSourceFile = pathToSourceFile.append(sourceAttributeValue);
+ return pathToSourceFile;
+ }
+ return null;
}
+
/**
*
* @param pageContext
- * @param uri node namespace uri
- * @return true if such template defined in facelets lib or falce if not defined
+ * @param uri
+ * node namespace uri
+ * @return true if such template defined in facelets lib or falce if not
+ * defined
*/
public static boolean isExistInCustomTlds(VpePageContext pageContext,
String uri) {
- return getCustomTLDDataMap(pageContext).containsKey(uri);
+ return getCustomTaglibObject(pageContext,uri)!=null?true:false;
}
/**
- * Looks for taglibs library
- * @param pageContext
- * @param sourceNode node for which we look for taglib library
- * @return path to taglibs, if such exists or null otherwise
- */
- public static IPath getCustomTLDPath(VpePageContext pageContext, Node sourceNode) {
- List<TaglibData> taglibs = XmlUtil.getTaglibsForNode(sourceNode,
- pageContext);
- TaglibData sourceNodeTaglib = XmlUtil.getTaglibForPrefix(sourceNode
- .getPrefix(), taglibs);
- String uri = sourceNodeTaglib.getUri();
- CustomTLDData customTLDData = getCustomTLDDataMap(pageContext).get(uri);
- if(customTLDData!=null) {
- return customTLDData.getTldFilePath();
- }
- return null;
- }
- /**
* Looks for custom taglib library map
+ *
* @return the customTLDDataMap
*/
- private static Map<String, CustomTLDData> getCustomTLDDataMap(
- VpePageContext pageContext) {
+ private static XModelObject getCustomTaglibObject(
+ VpePageContext pageContext, String uri) {
+ IEditorInput editorInput = pageContext.getEditPart().getEditorInput();
- Map<String, CustomTLDData> customTLDMap = new HashMap<String, CustomTLDData>();
-
- IEditorInput iEditorInput = pageContext.getEditPart().getEditorInput();
-
- if (iEditorInput instanceof IFileEditorInput) {
-
- IFileEditorInput iFileEditorInput = (IFileEditorInput) iEditorInput;
-
- IFile iFile = iFileEditorInput.getFile();
-
- IProject project = iFile.getProject();
- IModelNature nature = EclipseResourceUtil.getModelNature(project);
- if (nature != null) {
- XModel model = nature.getModel();
- XModelObject webXML = WebAppHelper.getWebApp(model);
- XModelObject param = WebAppHelper.findWebAppContextParam(
- webXML, CustomTLDReference.FACELETS_LIBS_PARAMETER);
- if (param != null) {
- String value = param.getAttributeValue(PARAM_VALUE);
- if (value != null) {
- String[] libs = value.split(";");//$NON-NLS-1$
- for (String faceletLib : libs) {
- IPath rootPath = VpeStyleUtil
- .getRootPath(iEditorInput);
- IPath projectPath = ((IFileEditorInput)iEditorInput).getFile().getProject().getLocation();
-
- IPath pathToCustonTld = new Path(faceletLib);
-
- pathToCustonTld = rootPath.append(pathToCustonTld);
- pathToCustonTld = pathToCustonTld.makeRelativeTo(projectPath);
- pathToCustonTld = ((IFileEditorInput)iEditorInput).getFile().getProject().getFile(pathToCustonTld).getFullPath();
- CustomTLDData customTLDData = new CustomTLDData(
- pathToCustonTld, CustomTLDParser
- .getNameSpace(pathToCustonTld));
- if (customTLDData.getNamespace() != null) {
- customTLDMap.put(customTLDData.getNamespace(),
- customTLDData);
- }
- }
- }
- }
+ if (editorInput instanceof IFileEditorInput) {
+ XModel xm = null;
+ IProject project = ((IFileEditorInput) editorInput).getFile()
+ .getProject();
+ IModelNature mn = EclipseResourceUtil.getModelNature(project);
+ if (mn != null) {
+ xm = mn.getModel();
}
+ if (xm != null) {
+ return WebProject.getInstance(xm).getTaglibMapping().getTaglibObject(uri);
+ }
}
- return customTLDMap;
+ return null;
}
+
}
16 years, 9 months
JBoss Tools SVN: r16578 - trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2009-07-15 05:56:07 -0400 (Wed, 15 Jul 2009)
New Revision: 16578
Modified:
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/PartnerLinkImplSection.java
Log:
JBIDE-4617: when create a partner link, in the property view, detail tab, the partner link type should be disable because the original value of the partner link type is none
Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/PartnerLinkImplSection.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/PartnerLinkImplSection.java 2009-07-15 09:35:55 UTC (rev 16577)
+++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/PartnerLinkImplSection.java 2009-07-15 09:56:07 UTC (rev 16578)
@@ -466,7 +466,6 @@
- @SuppressWarnings("unchecked")
protected void updateMyRolePartnerRoleWidgets ( PartnerLink pl ) {
PartnerLinkType plt = pl.getPartnerLinkType();
@@ -536,6 +535,9 @@
if (plt == null) {
fPartnerLinkTypeHref.setText(Messages.PartnerLinkImplSection_8);
// partnerLinkTypeName.setText("(None)");
+
+ // added by Grid.Qian
+ fPartnerLinkTypeHref.setEnabled(false);
return;
}
@@ -545,6 +547,9 @@
name = label.getLabel( plt );
}
fPartnerLinkTypeHref.setText( name );
+
+ // added by Grid.Qian
+ fPartnerLinkTypeHref.setEnabled(true);
// partnerLinkTypeName.setText(name);
}
16 years, 9 months
JBoss Tools SVN: r16577 - trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2009-07-15 05:35:55 -0400 (Wed, 15 Jul 2009)
New Revision: 16577
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateInitWizardPage.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/Messages.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/messages.properties
Log:
https://jira.jboss.org/jira/browse/JBIDE-4555
warning removed.
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateInitWizardPage.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateInitWizardPage.java 2009-07-15 09:21:37 UTC (rev 16576)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateInitWizardPage.java 2009-07-15 09:35:55 UTC (rev 16577)
@@ -210,10 +210,6 @@
return;
}
- if (selectMethod.getSelection()){ // TODO: can't check that dialect set
- setWarningMessage(Messages.GenerateInitWizardPage_wrn_msg_check_hibernate_dialect);
- }
-
setPageComplete(true);
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/Messages.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/Messages.java 2009-07-15 09:21:37 UTC (rev 16576)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/Messages.java 2009-07-15 09:35:55 UTC (rev 16577)
@@ -28,7 +28,6 @@
public static String GenerateInitWizardPage_databaseShema;
public static String GenerateInitWizardPage_err_msg_select_console_configuration;
public static String GenerateInitWizardPage_err_msg_select_connection_profile;
- public static String GenerateInitWizardPage_wrn_msg_check_hibernate_dialect;
public static String GenerateDdlWizardPage_file_name;
public static String GenerateDdlWizardPage_err_msg_input_file_name;
public static String HibernatePropertiesComposite_basic_properties;
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/messages.properties
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/messages.properties 2009-07-15 09:21:37 UTC (rev 16576)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/messages.properties 2009-07-15 09:35:55 UTC (rev 16577)
@@ -7,7 +7,6 @@
GenerateInitWizardPage_databaseShema=Schema
GenerateInitWizardPage_err_msg_select_console_configuration=Please, select console configuration
GenerateInitWizardPage_err_msg_select_connection_profile=Please, select connection profile
-GenerateInitWizardPage_wrn_msg_check_hibernate_dialect=Impossible to check that hibernate dialect is set.
GenerateDdlWizardPage_file_name=File name
GenerateDdlWizardPage_err_msg_input_file_name=Please, input file name
HibernatePropertiesComposite_basic_properties=Basic properties
16 years, 9 months
JBoss Tools SVN: r16576 - trunk.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2009-07-15 05:21:37 -0400 (Wed, 15 Jul 2009)
New Revision: 16576
Removed:
trunk/org.eclipse.bpel.model/
Log:
remove the plugin because it is added by my fault
16 years, 9 months
JBoss Tools SVN: r16574 - trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2009-07-15 04:32:47 -0400 (Wed, 15 Jul 2009)
New Revision: 16574
Modified:
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/BrowseSelectorDialog.java
Log:
JBIDE-4616: if the chosen element is 0, there is a error on the 'choose type of variable' wizard
Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/BrowseSelectorDialog.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/BrowseSelectorDialog.java 2009-07-15 08:19:45 UTC (rev 16573)
+++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/BrowseSelectorDialog.java 2009-07-15 08:32:47 UTC (rev 16574)
@@ -165,7 +165,7 @@
computeResult();
Object obj[] = getResult();
- if (obj != null || obj.length > 0) {
+ if (obj != null && obj.length > 0) {
if (ensureXSDTypeNamespaceMappings ( obj[0] ) == false) {
return ;
}
16 years, 9 months