[jbosstools-commits] JBoss Tools SVN: r11846 - trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute.
Author: scabanovich
Date: 2008-11-17 10:41:48 -0500 (Mon, 17 Nov 2008)
New Revision: 11846
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/AttributeContentProposalProviderFactory.java
Log:
JBIDE-2575
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/AttributeContentProposalProviderFactory.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/AttributeContentProposalProviderFactory.java 2008-11-17
15:37:15 UTC (rev 11845)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/AttributeContentProposalProviderFactory.java 2008-11-17
15:41:48 UTC (rev 11846)
@@ -56,6 +56,15 @@
}
public static void registerContentAssist(DefaultValueAdapter valueAdapter, Control
control) {
+ XModelObject object = valueAdapter.getModelObject();
+ XAttribute attr = valueAdapter.getAttribute();
+ if (attr == null && valueAdapter.getAttributeData() != null) {
+ attr = valueAdapter.getAttributeData().getAttribute();
+ }
+ registerContentAssist(object, attr, control);
+ }
+
+ public static void registerContentAssist(XModelObject object, XAttribute attr, Control
control) {
IControlContentAdapter controlAdapter = control instanceof Text
? new TextContentAdapter()
: control instanceof Combo
@@ -64,11 +73,6 @@
if(controlAdapter == null) {
return;
}
- XModelObject object = valueAdapter.getModelObject();
- XAttribute attr = valueAdapter.getAttribute();
- if (attr == null && valueAdapter.getAttributeData() != null) {
- attr = valueAdapter.getAttributeData().getAttribute();
- }
AttributeContentProposalProviderFactory factory = new
AttributeContentProposalProviderFactory();
final List<IAttributeContentProposalProvider> ps = factory
.getContentProposalProviders(object, attr);