Author: scabanovich
Date: 2009-10-01 09:34:45 -0400 (Thu, 01 Oct 2009)
New Revision: 17836
Added:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/PropertiesContentAssistProvider.java
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/schema/propertiesFileContentAssist.exsd
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/IAttributeContentProposalProvider.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/DefaultTreeSelectionContentAssistProvider.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/JavaClassContentAssistProvider.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4916
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/schema/propertiesFileContentAssist.exsd
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/schema/propertiesFileContentAssist.exsd 2009-10-01
13:19:56 UTC (rev 17835)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/schema/propertiesFileContentAssist.exsd 2009-10-01
13:34:45 UTC (rev 17836)
@@ -66,6 +66,16 @@
</documentation>
</annotation>
</attribute>
+ <attribute name="attributeProcessor" type="string">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ <appInfo>
+ <meta.attribute kind="java"/>
+ </appInfo>
+ </annotation>
+ </attribute>
</complexType>
</element>
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 2009-10-01
13:19:56 UTC (rev 17835)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/AttributeContentProposalProviderFactory.java 2009-10-01
13:34:45 UTC (rev 17836)
@@ -39,6 +39,7 @@
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Text;
import org.jboss.tools.common.meta.XAttribute;
+import org.jboss.tools.common.meta.action.XEntityData;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.ui.ModelUIPlugin;
import org.jboss.tools.common.model.ui.attribute.adapter.DefaultValueAdapter;
@@ -68,18 +69,22 @@
public static void registerContentAssist(DefaultValueAdapter valueAdapter, Control
control, IContentProposalListener2 listener) {
XModelObject object = valueAdapter.getModelObject();
+ XEntityData data = null;
+ if(valueAdapter.getAttributeData() != null) {
+ data = valueAdapter.getAttributeData().getEntityData();
+ }
XAttribute attr = valueAdapter.getAttribute();
if (attr == null && valueAdapter.getAttributeData() != null) {
attr = valueAdapter.getAttributeData().getAttribute();
}
- registerContentAssist(object, attr, control, listener);
+ registerContentAssist(object, data, attr, control, listener);
}
- public static void registerContentAssist(XModelObject object, XAttribute attr, Control
control) {
- registerContentAssist(object, attr, control, null);
+ public static void registerContentAssist(XModelObject object, XEntityData data,
XAttribute attr, Control control) {
+ registerContentAssist(object, data, attr, control, null);
}
- public static void registerContentAssist(XModelObject object, XAttribute attr, Control
control, IContentProposalListener2 listener) {
+ public static void registerContentAssist(XModelObject object, XEntityData data,
XAttribute attr, Control control, IContentProposalListener2 listener) {
IControlContentAdapter controlAdapter = control instanceof Text
? new TextContentAdapter()
: control instanceof Combo
@@ -93,7 +98,7 @@
.getContentProposalProviders(object, attr);
boolean added = false;
for (IAttributeContentProposalProvider p : ps) {
- p.init(object, attr);
+ p.init(object, data, attr);
IContentProposalProvider cpp = p.getContentProposalProvider();
if (cpp == null)
continue;
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/IAttributeContentProposalProvider.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/IAttributeContentProposalProvider.java 2009-10-01
13:19:56 UTC (rev 17835)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/IAttributeContentProposalProvider.java 2009-10-01
13:34:45 UTC (rev 17836)
@@ -13,6 +13,7 @@
import org.eclipse.jface.fieldassist.IContentProposalProvider;
import org.eclipse.jface.viewers.LabelProvider;
import org.jboss.tools.common.meta.XAttribute;
+import org.jboss.tools.common.meta.action.XEntityData;
import org.jboss.tools.common.model.XModelObject;
/**
@@ -22,7 +23,7 @@
public boolean isRelevant(XModelObject object, XAttribute attribute);
- public void init(XModelObject object, XAttribute attribute);
+ public void init(XModelObject object, XEntityData data, XAttribute attribute);
public IContentProposalProvider getContentProposalProvider();
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/DefaultTreeSelectionContentAssistProvider.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/DefaultTreeSelectionContentAssistProvider.java 2009-10-01
13:19:56 UTC (rev 17835)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/DefaultTreeSelectionContentAssistProvider.java 2009-10-01
13:34:45 UTC (rev 17836)
@@ -17,6 +17,7 @@
import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.swt.graphics.Image;
import org.jboss.tools.common.meta.XAttribute;
+import org.jboss.tools.common.meta.action.XEntityData;
import org.jboss.tools.common.model.*;
import
org.jboss.tools.common.model.ui.attribute.AttributeContentProposalProviderFactory;
import org.jboss.tools.common.model.ui.attribute.IAttributeContentProposalProvider;
@@ -97,7 +98,7 @@
return ContentProposalAdapter.PROPOSAL_REPLACE;
}
- public void init(XModelObject object, XAttribute attribute) {
+ public void init(XModelObject object, XEntityData data, XAttribute attribute) {
this.object = object;
this.attribute = attribute;
treeProvider = new DefaultXAttributeTreeContentProvider(attribute, object.getModel(),
object);
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/JavaClassContentAssistProvider.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/JavaClassContentAssistProvider.java 2009-10-01
13:19:56 UTC (rev 17835)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/JavaClassContentAssistProvider.java 2009-10-01
13:34:45 UTC (rev 17836)
@@ -26,6 +26,7 @@
import org.eclipse.pde.internal.ui.editor.contentassist.TypePackageCompletionProcessor;
import org.eclipse.swt.graphics.Image;
import org.jboss.tools.common.meta.XAttribute;
+import org.jboss.tools.common.meta.action.XEntityData;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.ui.attribute.IAttributeContentProposalProvider;
import org.jboss.tools.common.model.ui.attribute.editor.JavaHyperlinkCueLabelProvider;
@@ -44,7 +45,7 @@
return ContentProposalAdapter.PROPOSAL_REPLACE;
}
- public void init(XModelObject object, XAttribute attribute) {
+ public void init(XModelObject object, XEntityData data, XAttribute attribute) {
this.object = object;
this.attribute = attribute;
}
Added:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/PropertiesContentAssistProvider.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/PropertiesContentAssistProvider.java
(rev 0)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/PropertiesContentAssistProvider.java 2009-10-01
13:34:45 UTC (rev 17836)
@@ -0,0 +1,65 @@
+/*******************************************************************************
+ * Copyright (c) 2007 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:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.common.model.ui.attribute.adapter;
+
+import org.eclipse.jface.fieldassist.ContentProposalAdapter;
+import org.eclipse.jface.fieldassist.IContentProposalProvider;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.jboss.tools.common.meta.XAttribute;
+import org.jboss.tools.common.meta.action.XEntityData;
+import org.jboss.tools.common.model.XModelObject;
+import org.jboss.tools.common.model.filesystems.impl.FileAnyImpl;
+import org.jboss.tools.common.model.ui.attribute.IAttributeContentProposalProvider;
+
+public class PropertiesContentAssistProvider implements
+ IAttributeContentProposalProvider {
+ XModelObject object;
+ XEntityData data;
+ XAttribute attribute;
+
+ public PropertiesContentAssistProvider() {}
+
+ public boolean isRelevant(XModelObject object, XAttribute attribute) {
+ if(object == null || attribute == null) return false;
+ if("Property".equals(attribute.getModelEntity().getName())) return true;
+ return false;
+ }
+
+ public void init(XModelObject object, XEntityData data, XAttribute attribute) {
+ this.object = object;
+ this.data = data;
+ this.attribute = attribute;
+
+ XModelObject f = object;
+ while(f != null && f.getFileType() != XModelObject.FILE) f = f.getParent();
+ if(f == null) return;
+ String fileName = FileAnyImpl.toFileName(f);
+
+ }
+
+ public IContentProposalProvider getContentProposalProvider() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public LabelProvider getCustomLabelProbider() {
+ return null;
+ }
+
+ public int getProposalAcceptanceStyle() {
+ return ContentProposalAdapter.PROPOSAL_REPLACE;
+ }
+
+ public void dispose() {
+
+ }
+
+}
Property changes on:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/PropertiesContentAssistProvider.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain