JBoss Tools SVN: r2552 - trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model.
by jbosstools-commits＠lists.jboss.org
Author: mdryakhlenkov
Date: 2007-07-20 10:15:20 -0400 (Fri, 20 Jul 2007)
New Revision: 2552
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/OrmDiagram.java
Log:
EXIN-366: Adding elements on the diagram by double-click on fields of classes which have additional information in mapping files
Open reference of subclass bug fixed
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/OrmDiagram.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/OrmDiagram.java 2007-07-20 14:05:54 UTC (rev 2551)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/OrmDiagram.java 2007-07-20 14:15:20 UTC (rev 2552)
@@ -23,6 +23,7 @@
import org.hibernate.mapping.Column;
import org.hibernate.mapping.Component;
import org.hibernate.mapping.DependantValue;
+import org.hibernate.mapping.Join;
import org.hibernate.mapping.KeyValue;
import org.hibernate.mapping.OneToMany;
import org.hibernate.mapping.PersistentClass;
@@ -215,6 +216,17 @@
}
OrmShape ownerTableShape = getOrCreateDatabaseTable(((Subclass)element).getRootTable());
createConnections(subclassShape, ownerTableShape);
+
+ Iterator joinIterator = subclass.getJoinIterator();
+ while (joinIterator.hasNext()) {
+ Join join = (Join)joinIterator.next();
+ Iterator iterator = join.getPropertyIterator();
+ while (iterator.hasNext()) {
+ Property property = (Property)iterator.next();
+ OrmShape tableShape = getOrCreateDatabaseTable(property.getValue().getTable());
+ createConnections(subclassShape, tableShape);
+ }
+ }
}
}
@@ -230,6 +242,17 @@
}
}
}
+
+ Iterator joinIterator = persistentClass.getJoinIterator();
+ while (joinIterator.hasNext()) {
+ Join join = (Join)joinIterator.next();
+ Iterator iterator = join.getPropertyIterator();
+ while (iterator.hasNext()) {
+ Property property = (Property)iterator.next();
+ OrmShape tableShape = getOrCreateDatabaseTable(property.getValue().getTable());
+ createConnections(classShape, tableShape);
+ }
+ }
}
return classShape;
}
@@ -362,7 +385,7 @@
s.firePropertyChange(REFRESH, null, null);
}
} else if (clazz instanceof Subclass) {
- s = getOrCreatePersistentClass(((SingleTableSubclass)clazz).getRootClass(), null);
+ s = getOrCreatePersistentClass(((Subclass)clazz).getRootClass(), null);
}
}
} else {
17 years, 5 months
JBoss Tools SVN: r2551 - trunk/documentation/GettingStartedGuide/docs/userguide/en/modules.
by jbosstools-commits＠lists.jboss.org
Author: sabrashevich
Date: 2007-07-20 10:05:54 -0400 (Fri, 20 Jul 2007)
New Revision: 2551
Modified:
trunk/documentation/GettingStartedGuide/docs/userguide/en/modules/GettingStartedWithRHDS.xml
Log:
http://jira.jboss.com/jira/browse/EXIN-104?page=comments improved "Prerequisites" section in the GSG guide
Modified: trunk/documentation/GettingStartedGuide/docs/userguide/en/modules/GettingStartedWithRHDS.xml
===================================================================
--- trunk/documentation/GettingStartedGuide/docs/userguide/en/modules/GettingStartedWithRHDS.xml 2007-07-20 13:57:36 UTC (rev 2550)
+++ trunk/documentation/GettingStartedGuide/docs/userguide/en/modules/GettingStartedWithRHDS.xml 2007-07-20 14:05:54 UTC (rev 2551)
@@ -10,15 +10,25 @@
</keywordset>
</chapterinfo>
<title>Getting Started with Red Hat Developer Studio</title>
- <section id="Installing">
- <?dbhtml filename="Installing.html"?>
- <title>Installation</title>
+ <section id="Prerequisites">
+ <?dbhtml filename="Prerequisites.html"?>
+ <title>Prerequisites</title>
+ <para>Before installation Red Hat Developer Studio make sure you have an appropriate JDK version installed on your Linux system. Studio will properly work with the next JDK's:</para>
+ <itemizedlist>
+ <listitem>JDK 1.5</listitem>
+ <listitem>JDK 1.6</listitem>
+ </itemizedlist>
+ <para>If your Linux comes with no proper JDK you should install it.</para>
+ <para>For proper installation the java from Sun there is need to install the java from .rpm file or after installing it from .bin it is need to tune the java with command "alternative".</para>
+ <para>Red Hat Enterprise Linux includes several JDK's from Sun, IBM, and BEA. For RHEL 4, they are in the "Extras" RHN Channel. For RHEL 5, they are in the "Supplementary" RHN channel.
+</para>
<section id="HowToInstallJDK">
<title>How to setup and install a proper JDK on RHEL</title>
- <section id="RHEL_JDK_support"><title>What Java Development Kits (JDKs) are provided with Red Hat Enterprise Linux and what support does Red Hat offer for them?</title>
+ <section id="RHEL_JDK_support">
+ <title>What Java Development Kits (JDKs) are provided with Red Hat Enterprise Linux and what support does Red Hat offer for them?</title>
<para>To make it as easy as possible for customers to install and run Java applications on Red Hat Enterprise Linux, third-party Java Development Kits
(JDKs) from IBM and BEA are provided through the Red Hat Enterprise Linux Extras channel on Red Hat Network (RHN) and on the Red Hat Enterprise
- Linux Extras CD. Red Hat's current and planned availability of the IBM JDK is as follows:</para>
+ Linux Extras CD. Red Hat's current and planned availability of the IBM JDK is as follows:</para>
<itemizedlist>
<listitem><para>IBM JDK 1.4.2.3. (currently shipped with Red Hat Enterprise Linux 3 Update 8 and Red Hat Enterprise Linux 4 Update 4)</para></listitem>
@@ -102,8 +112,11 @@
<programlisting><![CDATA[$ ln -s /usr/java/latest/jre/plugin/i386/ns7/libjavaplugin_oji.so /usr/lib/mozilla/plugins/]]></programlisting>
</section>
-
+ </section>
</section>
+ <section id="Installing">
+ <?dbhtml filename="Installing.html"?>
+ <title>Installation</title>
<section id="Inst from down ver">
<title>Installing from the downloaded version</title>
<itemizedlist>
@@ -148,8 +161,8 @@
<title>Installing via update Site</title>
TBD
</section>
-
- </section>
+ </section>
+
<section id="Upgrading">
<?dbhtml filename="Upgrading.html"?>
<title>Upgrading</title>
17 years, 5 months
JBoss Tools SVN: r2550 - in trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors: parts and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2007-07-20 09:57:36 -0400 (Fri, 20 Jul 2007)
New Revision: 2550
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/OrmDiagram.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/OrmShapeEditPart.java
Log:
http://jira.jboss.com/jira/browse/EXIN-365
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/OrmDiagram.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/OrmDiagram.java 2007-07-20 13:45:42 UTC (rev 2549)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/OrmDiagram.java 2007-07-20 13:57:36 UTC (rev 2550)
@@ -95,7 +95,7 @@
}
public void save() {
- String string = "";
+ /*String string = "";
saveHelper();
for (int i = 0; i < childrenLocations.length; i++)
string+=childrenLocations[i]+"#";
@@ -110,7 +110,7 @@
string.substring(2048*i));
} catch (CoreException e) {
// ExceptionHandler.logThrowableError(e, e.getMessage());
- }
+ }*/
}
private void saveHelper() {
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/OrmShapeEditPart.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/OrmShapeEditPart.java 2007-07-20 13:45:42 UTC (rev 2549)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/OrmShapeEditPart.java 2007-07-20 13:57:36 UTC (rev 2550)
@@ -92,7 +92,7 @@
String prop = evt.getPropertyName();
if (OrmShape.LOCATION_PROP.equals(prop)) {
refreshVisuals();
- ((OrmDiagram)getParent().getModel()).setDirty(true);
+ //((OrmDiagram)getParent().getModel()).setDirty(true);
} else if (OrmShape.SET_HIDEN.equals(prop)) {
int i = figure.getPreferredSize().width;
((TitleFigure)figure).setHiden(((Boolean)evt.getNewValue()).booleanValue());
@@ -102,7 +102,7 @@
else
figure.setSize(-1,-1);
refresh();
- ((OrmDiagram)getParent().getModel()).setDirty(true);
+ //((OrmDiagram)getParent().getModel()).setDirty(true);
} else {
super.propertyChange(evt);
}
17 years, 5 months
JBoss Tools SVN: r2549 - in trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common: model/util and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-07-20 09:45:42 -0400 (Fri, 20 Jul 2007)
New Revision: 2549
Removed:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/XMLEntityResolver.java
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/MetaLibLoader.java
Log:
EXIN-86 deprecated XMLEntityResolver removed
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/MetaLibLoader.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/MetaLibLoader.java 2007-07-20 13:45:10 UTC (rev 2548)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/MetaLibLoader.java 2007-07-20 13:45:42 UTC (rev 2549)
@@ -20,13 +20,14 @@
import org.jboss.tools.common.model.plugin.ModelPlugin;
import org.jboss.tools.common.model.util.*;
+import org.jboss.tools.common.xml.XMLEntityResolver;
public class MetaLibLoader {
public static String DOC_PUBLICID = "-//Red Hat, Inc.//DTD Meta 1.0//EN";
static {
try {
- Class c = MetaLibLoader.class;
+ Class<?> c = MetaLibLoader.class;
XMLEntityResolver.registerPublicEntity(DOC_PUBLICID, FileLocator.resolve(c.getResource("/meta/meta.dtd")).toString());
} catch (Exception e) {
ModelPlugin.getPluginLog().logError(e);
Deleted: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/XMLEntityResolver.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/XMLEntityResolver.java 2007-07-20 13:45:10 UTC (rev 2548)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/XMLEntityResolver.java 2007-07-20 13:45:42 UTC (rev 2549)
@@ -1,39 +0,0 @@
-/**
- * @deprecated
- */
-
-package org.jboss.tools.common.model.util;
-
-import org.xml.sax.*;
-
-public class XMLEntityResolver implements EntityResolver {
-
- public static void registerPublicEntity(String publicId, String url) {
- org.jboss.tools.common.xml.XMLEntityResolver.registerPublicEntity(publicId, url);
- }
-
- public static void registerSystemEntity(String systemId, String url) {
- org.jboss.tools.common.xml.XMLEntityResolver.registerSystemEntity(systemId, url);
- }
-
- public static EntityResolver getInstance() {
- return new XMLEntityResolver();
- }
-
- EntityResolver impl;
-
- private XMLEntityResolver() {
- impl = getInstance();
- }
-
- public InputSource resolveEntity(String publicId, String systemId)
- throws SAXException, java.io.IOException {
- return impl.resolveEntity(publicId, systemId);
- }
-
- public InputSource resolveEntity2(String publicId, String systemId)
- throws SAXException, java.io.IOException {
- return impl.resolveEntity(publicId, systemId);
- }
-
-}
\ No newline at end of file
17 years, 5 months
JBoss Tools SVN: r2548 - trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-07-20 09:45:10 -0400 (Fri, 20 Jul 2007)
New Revision: 2548
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/HibernateRecognizer.java
Log:
EXIN-86 deprecated XMLEntityResolver removed
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/HibernateRecognizer.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/HibernateRecognizer.java 2007-07-20 13:44:30 UTC (rev 2547)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/HibernateRecognizer.java 2007-07-20 13:45:10 UTC (rev 2548)
@@ -12,7 +12,7 @@
import org.eclipse.core.runtime.FileLocator;
import org.jboss.tools.common.model.loaders.EntityRecognizer;
-import org.jboss.tools.common.model.util.XMLEntityResolver;
+import org.jboss.tools.common.xml.XMLEntityResolver;
public class HibernateRecognizer implements EntityRecognizer {
static {
17 years, 5 months
JBoss Tools SVN: r2547 - trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-07-20 09:44:30 -0400 (Fri, 20 Jul 2007)
New Revision: 2547
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFEntityRecognizer.java
Log:
EXIN-86 deprecated XMLEntityResolver removed
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFEntityRecognizer.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFEntityRecognizer.java 2007-07-20 13:43:47 UTC (rev 2546)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFEntityRecognizer.java 2007-07-20 13:44:30 UTC (rev 2547)
@@ -12,14 +12,14 @@
import org.eclipse.core.runtime.FileLocator;
import org.jboss.tools.common.model.loaders.*;
-import org.jboss.tools.common.model.util.*;
+import org.jboss.tools.common.xml.XMLEntityResolver;
import org.jboss.tools.jsf.JSFModelPlugin;
public class JSFEntityRecognizer implements EntityRecognizer, JSFConstants {
static {
try {
- Class c = JSFEntityRecognizer.class;
+ Class<?> c = JSFEntityRecognizer.class;
XMLEntityResolver.registerPublicEntity(DOC_PUBLICID, FileLocator.resolve(c.getResource("/meta/web-facesconfig_1_0.dtd")).toString());
XMLEntityResolver.registerPublicEntity(DOC_PUBLICID_11, FileLocator.resolve(c.getResource("/meta/web-facesconfig_1_1.dtd")).toString());
} catch (Exception e) {
17 years, 5 months
JBoss Tools SVN: r2546 - trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-07-20 09:43:47 -0400 (Fri, 20 Jul 2007)
New Revision: 2546
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/FileTLDRecognizer.java
Log:
EXIN-86 deprecated XMLEntityResolver removed
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/FileTLDRecognizer.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/FileTLDRecognizer.java 2007-07-20 13:42:58 UTC (rev 2545)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/model/FileTLDRecognizer.java 2007-07-20 13:43:47 UTC (rev 2546)
@@ -11,7 +11,7 @@
package org.jboss.tools.jst.web.tld.model;
import org.jboss.tools.common.model.loaders.*;
-import org.jboss.tools.common.model.util.*;
+import org.jboss.tools.common.xml.XMLEntityResolver;
public class FileTLDRecognizer implements EntityRecognizer, TLDConstants {
static {
17 years, 5 months
JBoss Tools SVN: r2545 - in trunk/shale/plugins/org.jboss.tools.shale/src/org/jboss/tools/shale/model: dialog and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-07-20 09:42:58 -0400 (Fri, 20 Jul 2007)
New Revision: 2545
Modified:
trunk/shale/plugins/org.jboss.tools.shale/src/org/jboss/tools/shale/model/clay/ShaleClayEntityRecognizer.java
trunk/shale/plugins/org.jboss.tools.shale/src/org/jboss/tools/shale/model/dialog/ShaleDialogEntityRecognizer.java
trunk/shale/plugins/org.jboss.tools.shale/src/org/jboss/tools/shale/model/spring/SpringBeansEntityRecognizer.java
Log:
EXIN-86 deprecated XMLEntityResolver removed
Modified: trunk/shale/plugins/org.jboss.tools.shale/src/org/jboss/tools/shale/model/clay/ShaleClayEntityRecognizer.java
===================================================================
--- trunk/shale/plugins/org.jboss.tools.shale/src/org/jboss/tools/shale/model/clay/ShaleClayEntityRecognizer.java 2007-07-20 13:25:41 UTC (rev 2544)
+++ trunk/shale/plugins/org.jboss.tools.shale/src/org/jboss/tools/shale/model/clay/ShaleClayEntityRecognizer.java 2007-07-20 13:42:58 UTC (rev 2545)
@@ -12,14 +12,14 @@
import org.eclipse.core.runtime.FileLocator;
import org.jboss.tools.common.model.loaders.EntityRecognizer;
-import org.jboss.tools.common.model.util.XMLEntityResolver;
+import org.jboss.tools.common.xml.XMLEntityResolver;
import org.jboss.tools.shale.ShaleModelPlugin;
public class ShaleClayEntityRecognizer implements ShaleClayConstants, EntityRecognizer {
static {
try {
- Class c = ShaleClayEntityRecognizer.class;
+ Class<?> c = ShaleClayEntityRecognizer.class;
XMLEntityResolver.registerPublicEntity(DOC_PUBLICID, FileLocator.resolve(c.getResource("/meta/shale-clay-config_1_0.dtd")).toString());
} catch (Exception e) {
ShaleModelPlugin.getPluginLog().logError(e);
Modified: trunk/shale/plugins/org.jboss.tools.shale/src/org/jboss/tools/shale/model/dialog/ShaleDialogEntityRecognizer.java
===================================================================
--- trunk/shale/plugins/org.jboss.tools.shale/src/org/jboss/tools/shale/model/dialog/ShaleDialogEntityRecognizer.java 2007-07-20 13:25:41 UTC (rev 2544)
+++ trunk/shale/plugins/org.jboss.tools.shale/src/org/jboss/tools/shale/model/dialog/ShaleDialogEntityRecognizer.java 2007-07-20 13:42:58 UTC (rev 2545)
@@ -12,14 +12,14 @@
import org.eclipse.core.runtime.FileLocator;
import org.jboss.tools.common.model.loaders.EntityRecognizer;
-import org.jboss.tools.common.model.util.XMLEntityResolver;
+import org.jboss.tools.common.xml.XMLEntityResolver;
import org.jboss.tools.shale.ShaleModelPlugin;
public class ShaleDialogEntityRecognizer implements ShaleDialogConstants, EntityRecognizer {
static {
try {
- Class c = ShaleDialogEntityRecognizer.class;
+ Class<?> c = ShaleDialogEntityRecognizer.class;
XMLEntityResolver.registerPublicEntity(DOC_PUBLICID, FileLocator.resolve(c.getResource("/meta/shale-dialog-config_1_0.dtd")).toString());
} catch (Exception e) {
ShaleModelPlugin.getPluginLog().logError(e);
Modified: trunk/shale/plugins/org.jboss.tools.shale/src/org/jboss/tools/shale/model/spring/SpringBeansEntityRecognizer.java
===================================================================
--- trunk/shale/plugins/org.jboss.tools.shale/src/org/jboss/tools/shale/model/spring/SpringBeansEntityRecognizer.java 2007-07-20 13:25:41 UTC (rev 2544)
+++ trunk/shale/plugins/org.jboss.tools.shale/src/org/jboss/tools/shale/model/spring/SpringBeansEntityRecognizer.java 2007-07-20 13:42:58 UTC (rev 2545)
@@ -12,14 +12,14 @@
import org.eclipse.core.runtime.FileLocator;
import org.jboss.tools.common.model.loaders.EntityRecognizer;
-import org.jboss.tools.common.model.util.XMLEntityResolver;
+import org.jboss.tools.common.xml.XMLEntityResolver;
import org.jboss.tools.shale.ShaleModelPlugin;
public class SpringBeansEntityRecognizer implements SpringBeansConstants, EntityRecognizer {
static {
try {
- Class c = SpringBeansEntityRecognizer.class;
+ Class<?> c = SpringBeansEntityRecognizer.class;
XMLEntityResolver.registerPublicEntity(DOC_PUBLICID, FileLocator.resolve(c.getResource("/meta/spring-beans.dtd")).toString());
} catch (Exception e) {
ShaleModelPlugin.getPluginLog().logError(e);
17 years, 5 months
JBoss Tools SVN: r2544 - trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/resources/meta.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-07-20 09:25:41 -0400 (Fri, 20 Jul 2007)
New Revision: 2544
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/resources/meta/hibernate3.meta
Log:
EXIN-86
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/resources/meta/hibernate3.meta
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/resources/meta/hibernate3.meta 2007-07-20 13:10:56 UTC (rev 2543)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/resources/meta/hibernate3.meta 2007-07-20 13:25:41 UTC (rev 2544)
@@ -199,7 +199,7 @@
<Editor name="ListString"/>
</XModelAttribute>
<XModelAttribute PROPERTIES="category=advanced" default="true"
- name="default-lazy" xmlname="auto-import">
+ name="default-lazy" xmlname="default-lazy">
<Constraint loader="List">
<value name="true"/>
<value name="false"/>
17 years, 5 months
JBoss Tools SVN: r2543 - trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-07-20 09:10:56 -0400 (Fri, 20 Jul 2007)
New Revision: 2543
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/FacesConfigLoader.java
Log:
EXIN-86
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/FacesConfigLoader.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/FacesConfigLoader.java 2007-07-20 13:10:16 UTC (rev 2542)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/FacesConfigLoader.java 2007-07-20 13:10:56 UTC (rev 2543)
@@ -11,6 +11,8 @@
package org.jboss.tools.jsf.model;
import java.io.*;
+import java.util.Set;
+
import org.w3c.dom.*;
import org.jboss.tools.common.meta.XAttribute;
@@ -35,10 +37,13 @@
String body = XModelObjectLoaderUtil.getTempBody(object);
- String[] errors = (entity.equals(ENT_FACESCONFIG_12))
- ? new SAXValidator().getXMLErrors(new StringReader(body))
- : XMLUtil.getXMLErrors(new StringReader(body));
- if(errors != null && errors.length > 0) {
+ String[] errors =
+// (entity.equals(ENT_FACESCONFIG_12))
+// ? new SAXValidator().getXMLErrors(new StringReader(body))
+// : XMLUtil.getXMLErrors(new StringReader(body));
+ XMLUtil.getXMLErrors(new StringReader(body), false, false);
+ boolean hasErrors = (errors != null && errors.length > 0);
+ if(hasErrors) {
object.setAttributeValue("isIncorrect", "yes");
object.setAttributeValue("incorrectBody", body);
object.set("actualBodyTimeStamp", "-1");
@@ -55,6 +60,7 @@
}
Element element = doc.getDocumentElement();
util.load(element, object);
+ String loadingError = util.getError();
((FileFacesConfigImpl)object).updateRuleIndices();
@@ -71,6 +77,13 @@
}
reloadProcess(object);
object.set("actualBodyTimeStamp", "" + object.getTimeStamp());
+
+ ((AbstractXMLFileImpl)object).setLoaderError(loadingError);
+ if(!hasErrors && loadingError != null) {
+ object.setAttributeValue("isIncorrect", "yes");
+ object.setAttributeValue("incorrectBody", body);
+ object.set("actualBodyTimeStamp", "" + object.getTimeStamp());
+ }
}
protected void setEncoding(XModelObject object, String body) {
@@ -193,6 +206,23 @@
static String[] folders = new String[]{"Components", "Converters", "Managed Beans", "Navigation Rules", "Referenced Beans", "Render Kits", "Validators", "Extensions"};
+ protected Set<String> getAllowedChildren(XModelEntity entity) {
+ Set<String> children = super.getAllowedChildren(entity);
+ if("JSFManagedProperty".equals(entity.getName())
+ || "JSFListEntries".equals(entity.getName())
+ || "JSFMapEntry".equals(entity.getName())) {
+ children.add("value");
+ children.add("null-value");
+ }
+ return children;
+ }
+
+ protected Set<String> getAllowedAttributes(XModelEntity entity) {
+ Set<String> attributes = super.getAllowedAttributes(entity);
+ return attributes;
+ }
+
+
public void loadChildren(Element element, XModelObject o) {
if(o.getFileType() == XModelObject.FILE) {
super.loadChildren(element, o);
17 years, 5 months