[jbosstools-commits] JBoss Tools SVN: r3166 - in trunk/common/plugins/org.jboss.tools.common.model.ui: src/org/jboss/tools/common/editor and 1 other directories.
Author: scabanovich
Date: 2007-08-16 09:11:31 -0400 (Thu, 16 Aug 2007)
New Revision: 3166
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/plugin.xml
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/TreeFormPage.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/LayouredFormFactory.java
Log:
JBIDE-789
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/plugin.xml
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/plugin.xml 2007-08-16 13:10:56
UTC (rev 3165)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/plugin.xml 2007-08-16 13:11:31
UTC (rev 3166)
@@ -280,15 +280,8 @@
base-type="org.eclipse.core.runtime.xml"
describer="org.jboss.tools.common.model.ui.editor.XMLContentDescriber"
file-extensions="xml,meta"
- priority="high"
+ priority="high"
/>
- <content-type id="xml2"
- name="A Red Hat XML 2"
- base-type="org.eclipse.jst.j2ee.webDD"
- describer="org.jboss.tools.common.model.ui.editor.XMLContentDescriber"
- file-extensions="xml"
- priority="high"
- />
</extension>
<extension id="e" name="XML Editors"
point="org.jboss.tools.common.model.ui.xmlEditor">
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/TreeFormPage.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/TreeFormPage.java 2007-08-16
13:10:56 UTC (rev 3165)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/TreeFormPage.java 2007-08-16
13:11:31 UTC (rev 3166)
@@ -63,6 +63,7 @@
import org.jboss.tools.common.model.ui.forms.DefaultFormFactory;
import org.jboss.tools.common.model.ui.forms.FormFactory;
import org.jboss.tools.common.model.ui.forms.IFormFactory;
+import org.jboss.tools.common.model.ui.forms.LayouredFormFactory;
import org.jboss.tools.common.model.ui.forms.XModelObjectFormFactory;
import org.jboss.tools.common.model.ui.forms.DefaultFormContainer;
import org.jboss.tools.common.model.ui.forms.DefaultFormPage;
@@ -233,8 +234,12 @@
private IFormFactory getFormFactory(XModelObject selected) {
if(selected == null) return null;
XModelObjectFormFactory formFactory;
- String formFactoryClassName =
selected.getModelEntity().getProperty("formFactoryClassName");
+ String formFactoryClassName =
selected.getModelEntity().getProperty("formFactory");
+
if(formFactoryClassName != null) {
+ if("%Default%".equals(formFactoryClassName)) {
+ return new LayouredFormFactory(selected);
+ }
Class cls = ModelFeatureFactory.getInstance().getFeatureClass(formFactoryClassName);
if(cls == null) return new FormFactory(selected);
try {
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/LayouredFormFactory.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/LayouredFormFactory.java 2007-08-16
13:10:56 UTC (rev 3165)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/LayouredFormFactory.java 2007-08-16
13:11:31 UTC (rev 3166)
@@ -30,7 +30,7 @@
private void initialize() {
// String entityName = getXModelObject().getModelEntity().getName();
String formLayoutDataClassName = null;
- formLayoutDataClassName =
getXModelObject().getModelEntity().getProperty("formLayoutDataClassName");
+ formLayoutDataClassName =
getXModelObject().getModelEntity().getProperty("formLayout");
Class formLayoutDataClass =
ModelFeatureFactory.getInstance().getFeatureClass(formLayoutDataClassName);
try {
formLayoutData =
(IFormLayoutData)formLayoutDataClass.getMethod("getInstance",
(Class[])null).invoke(null, (Object[])null);