July 2007 - jbosstools-commits - Jboss List Archives

JBoss Tools SVN: r2242 - trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/any.

by jbosstools-commits＠lists.jboss.org

Author: mdryakhlenkov Date: 2007-07-02 12:37:29 -0400 (Mon, 02 Jul 2007) New Revision: 2242 Added: trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/any/Address.java trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/any/ComplexPropertyValue.java trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/any/IntegerPropertyValue.java trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/any/Person.hbm.xml trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/any/Person.java trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/any/Properties.hbm.xml trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/any/PropertySet.java trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/any/PropertyValue.java trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/any/StringPropertyValue.java Log: Added: trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/any/Address.java =================================================================== --- trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/any/Address.java (rev 0) +++ trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/any/Address.java 2007-07-02 16:37:29 UTC (rev 2242) @@ -0,0 +1,30 @@ +package mapping.any; + +import java.util.Set; +import java.util.HashSet; + +/** + * todo: describe Address + * + * @author Steve Ebersole + */ +public class Address { + private Long id; + private Set lines = new HashSet(); + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Set getLines() { + return lines; + } + + public void setLines(Set lines) { + this.lines = lines; + } +} Added: trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/any/ComplexPropertyValue.java =================================================================== --- trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/any/ComplexPropertyValue.java (rev 0) +++ trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/any/ComplexPropertyValue.java 2007-07-02 16:37:29 UTC (rev 2242) @@ -0,0 +1,47 @@ +package mapping.any; + +import java.util.Map; +import java.util.HashMap; +import java.util.Iterator; + +/** + * todo: describe ${NAME} + * + * @author Steve Ebersole + */ +public class ComplexPropertyValue implements PropertyValue { + private Long id; + private Map subProperties = new HashMap(); + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Map getSubProperties() { + return subProperties; + } + + public void setSubProperties(Map subProperties) { + this.subProperties = subProperties; + } + + public String asString() { + return "complex[" + keyString() + "]"; + } + + private String keyString() { + StringBuffer buff = new StringBuffer(); + Iterator itr = subProperties.keySet().iterator(); + while ( itr.hasNext() ) { + buff.append( itr.next() ); + if ( itr.hasNext() ) { + buff.append( ", " ); + } + } + return buff.toString(); + } +} Added: trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/any/IntegerPropertyValue.java =================================================================== --- trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/any/IntegerPropertyValue.java (rev 0) +++ trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/any/IntegerPropertyValue.java 2007-07-02 16:37:29 UTC (rev 2242) @@ -0,0 +1,38 @@ +package mapping.any; + +/** + * todo: describe IntegerPropertyValue + * + * @author Steve Ebersole + */ +public class IntegerPropertyValue implements PropertyValue { + private Long id; + private int value; + + public IntegerPropertyValue() { + } + + public IntegerPropertyValue(int value) { + this.value = value; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public int getValue() { + return value; + } + + public void setValue(int value) { + this.value = value; + } + + public String asString() { + return Integer.toString( value ); + } +} Added: trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/any/Person.hbm.xml =================================================================== --- trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/any/Person.hbm.xml (rev 0) +++ trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/any/Person.hbm.xml 2007-07-02 16:37:29 UTC (rev 2242) @@ -0,0 +1,30 @@ +<?xml version="1.0"?> +<!DOCTYPE hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> + +<hibernate-mapping package="mapping.any"> + + <class name="Person" table="T_ANY_PERSON"> + <id name="id" column="ID_"> + <generator class="increment" /> + </id> + <property name="name" /> + <any name="data" id-type="long" cascade="none"> + <meta-value value="A" class="Address"/> + <column name="DATATYPE_"/> + <column name="DATAID_"/> + </any> + </class> + + <class name="Address" table="T_ANY_ADDRESS"> + <id name="id" column="ID_"> + <generator class="increment" /> + </id> + <set name="lines" table="LINE"> + <key column="ADDRESS" /> + <element type="string" /> + </set> + </class> + +</hibernate-mapping> Added: trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/any/Person.java =================================================================== --- trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/any/Person.java (rev 0) +++ trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/any/Person.java 2007-07-02 16:37:29 UTC (rev 2242) @@ -0,0 +1,37 @@ +package mapping.any; + +/** + * todo: describe Person + * + * @author Steve Ebersole + */ +public class Person { + private Long id; + private String name; + private Object data; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Object getData() { + return data; + } + + public void setData(Object data) { + this.data = data; + } +} Added: trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/any/Properties.hbm.xml =================================================================== --- trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/any/Properties.hbm.xml (rev 0) +++ trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/any/Properties.hbm.xml 2007-07-02 16:37:29 UTC (rev 2242) @@ -0,0 +1,56 @@ +<?xml version="1.0"?> +<!DOCTYPE hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> + +<hibernate-mapping package="mapping.any"> + + <class name="PropertySet" table="T_PROP_SET"> + <id name="id" column="ID" type="long"> + <generator class="increment"/> + </id> + <property name="name" column="NAME" type="string"/> + <any name="someSpecificProperty" id-type="long" meta-type="string" cascade="all"> + <meta-value value="I" class="IntegerPropertyValue"/> + <meta-value value="S" class="StringPropertyValue"/> + <meta-value value="C" class="ComplexPropertyValue" /> + <column name="S_S_PROP_TYPE"/> + <column name="S_S_PROP_ID"/> + </any> + <map name="generalProperties" table="T_GEN_PROPS" lazy="true" cascade="all"> + <key column="PROP_SET_ID"/> + <map-key type="string" column="GEN_PROP_NAME"/> + <many-to-any id-type="long" meta-type="string"> + <meta-value value="I" class="IntegerPropertyValue"/> + <meta-value value="S" class="StringPropertyValue"/> + <column name="PROP_TYPE"/> + <column name="PROP_ID"/> + </many-to-any> + </map> + </class> + + <class name="StringPropertyValue" table="T_CHAR_PROP"> + <id name="id" column="ID" type="long"> + <generator class="increment"/> + </id> + <property name="value" column="VAL" not-null="true" type="string"/> + </class> + + <class name="IntegerPropertyValue" table="T_NUM_PROP"> + <id name="id" column="ID" type="long"> + <generator class="increment"/> + </id> + <property name="value" column="VAL" not-null="true" type="integer"/> + </class> + + <class name="ComplexPropertyValue" table="T_COMPLEX_PROP"> + <id name="id" column="ID" type="long"> + <generator class="increment"/> + </id> + <map name="subProperties" table="T_COMPLEX_SUB_PROPS" lazy="true"> + <key column="PROP_ID" /> + <map-key type="string" column="SUB_PROP_NAME" /> + <element type="string" column="SUB_PROP_VAL" /> + </map> + </class> +</hibernate-mapping> \ No newline at end of file Added: trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/any/PropertySet.java =================================================================== --- trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/any/PropertySet.java (rev 0) +++ trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/any/PropertySet.java 2007-07-02 16:37:29 UTC (rev 2242) @@ -0,0 +1,55 @@ +package mapping.any; + +import java.util.Map; +import java.util.HashMap; + +/** + * todo: describe PropertySet + * + * @author Steve Ebersole + */ +public class PropertySet { + private Long id; + private String name; + private PropertyValue someSpecificProperty; + private Map generalProperties = new HashMap(); + + public PropertySet() { + } + + public PropertySet(String name) { + this.name = name; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public PropertyValue getSomeSpecificProperty() { + return someSpecificProperty; + } + + public void setSomeSpecificProperty(PropertyValue someSpecificProperty) { + this.someSpecificProperty = someSpecificProperty; + } + + public Map getGeneralProperties() { + return generalProperties; + } + + public void setGeneralProperties(Map generalProperties) { + this.generalProperties = generalProperties; + } +} Added: trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/any/PropertyValue.java =================================================================== --- trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/any/PropertyValue.java (rev 0) +++ trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/any/PropertyValue.java 2007-07-02 16:37:29 UTC (rev 2242) @@ -0,0 +1,10 @@ +package mapping.any; + +/** + * todo: describe PropertyValue + * + * @author Steve Ebersole + */ +public interface PropertyValue { + public String asString(); +} Added: trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/any/StringPropertyValue.java =================================================================== --- trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/any/StringPropertyValue.java (rev 0) +++ trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/any/StringPropertyValue.java 2007-07-02 16:37:29 UTC (rev 2242) @@ -0,0 +1,38 @@ +package mapping.any; + +/** + * todo: describe StringPropertyValue + * + * @author Steve Ebersole + */ +public class StringPropertyValue implements PropertyValue { + private Long id; + private String value; + + public StringPropertyValue() { + } + + public StringPropertyValue(String value) { + this.value = value; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public String asString() { + return value; + } +}

16 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r2241 - trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/abstractembeddedcomponents/propertyref.

by jbosstools-commits＠lists.jboss.org

Author: mdryakhlenkov Date: 2007-07-02 12:37:05 -0400 (Mon, 02 Jul 2007) New Revision: 2241 Added: trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/abstractembeddedcomponents/propertyref/Address.java trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/abstractembeddedcomponents/propertyref/AddressImpl.java trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/abstractembeddedcomponents/propertyref/Mappings.hbm.xml trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/abstractembeddedcomponents/propertyref/Server.java trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/abstractembeddedcomponents/propertyref/ServerImpl.java Log: Added: trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/abstractembeddedcomponents/propertyref/Address.java =================================================================== --- trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/abstractembeddedcomponents/propertyref/Address.java (rev 0) +++ trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/abstractembeddedcomponents/propertyref/Address.java 2007-07-02 16:37:05 UTC (rev 2241) @@ -0,0 +1,13 @@ +package mapping.abstractembeddedcomponents.propertyref; + +/** + * @author Steve Ebersole + */ +public interface Address { + public Long getId(); + public void setId(Long id); + public String getAddressType(); + public void setAddressType(String addressType); + public Server getServer(); + public void setServer(Server server); +} Added: trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/abstractembeddedcomponents/propertyref/AddressImpl.java =================================================================== --- trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/abstractembeddedcomponents/propertyref/AddressImpl.java (rev 0) +++ trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/abstractembeddedcomponents/propertyref/AddressImpl.java 2007-07-02 16:37:05 UTC (rev 2241) @@ -0,0 +1,34 @@ +package mapping.abstractembeddedcomponents.propertyref; + +/** + * @author Steve Ebersole + */ +public class AddressImpl implements Address { + private Long id; + private String addressType; + private Server server; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getAddressType() { + return addressType; + } + + public void setAddressType(String addressType) { + this.addressType = addressType; + } + + public Server getServer() { + return server; + } + + public void setServer(Server server) { + this.server = server; + } +} Added: trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/abstractembeddedcomponents/propertyref/Mappings.hbm.xml =================================================================== --- trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/abstractembeddedcomponents/propertyref/Mappings.hbm.xml (rev 0) +++ trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/abstractembeddedcomponents/propertyref/Mappings.hbm.xml 2007-07-02 16:37:05 UTC (rev 2241) @@ -0,0 +1,43 @@ +<?xml version="1.0"?> +<!DOCTYPE hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> + +<hibernate-mapping package="mapping.abstractembeddedcomponents.propertyref"> + + <class name="Address" table="ADDRESS" proxy="Address"> + <id name="id" type="long" column="ADDRESS_ID"> + <generator class="native"/> + </id> + <discriminator column="ADDRESS_TYPE" type="string" length="30"/> + <properties name="uniqueAddress"> + <property name="addressType" column="ADDRESS_TYPE" type="string" insert="false" update="false" length="30"/> + <many-to-one name="server" column="SERVER_ID" class="Server" not-null="true"/> + </properties> + </class> + + <subclass name="AddressImpl" extends="Address" discriminator-value="2" proxy="Address"> + </subclass> + + <class name="Server" table="SERVER" proxy="Server"> + <id name="id" type="long" column="SERVER_ID"> + <generator class="native"/> + </id> + <discriminator column="SERVER_TYPE" type="string" length="10"/> + <property name="serverType" type="string" column="SERVER_TYPE" length="10" update="false" insert="false"/> + </class> + + <subclass name="ServerImpl" extends="Server" discriminator-value="1" proxy="Server"> + <many-to-one name="address" + class="AddressImpl" + property-ref="uniqueAddress" + cascade="all" + unique="true" + update="false" + insert="false"> + <column name="ADDRESS_TYPE"/> + <column name="SERVER_ID"/> + </many-to-one> + </subclass> + +</hibernate-mapping> Added: trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/abstractembeddedcomponents/propertyref/Server.java =================================================================== --- trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/abstractembeddedcomponents/propertyref/Server.java (rev 0) +++ trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/abstractembeddedcomponents/propertyref/Server.java 2007-07-02 16:37:05 UTC (rev 2241) @@ -0,0 +1,13 @@ +package mapping.abstractembeddedcomponents.propertyref; + +/** + * @author Steve Ebersole + */ +public interface Server { + public Long getId(); + public void setId(Long id); + public String getServerType(); + public void setServerType(String serverType); + public Address getAddress(); + public void setAddress(Address address); +} Added: trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/abstractembeddedcomponents/propertyref/ServerImpl.java =================================================================== --- trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/abstractembeddedcomponents/propertyref/ServerImpl.java (rev 0) +++ trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/abstractembeddedcomponents/propertyref/ServerImpl.java 2007-07-02 16:37:05 UTC (rev 2241) @@ -0,0 +1,35 @@ +package mapping.abstractembeddedcomponents.propertyref; + + +/** + * @author Steve Ebersole + */ +public class ServerImpl implements Server { + private Long id; + private String serverType; + private Address address; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getServerType() { + return serverType; + } + + public void setServerType(String serverType) { + this.serverType = serverType; + } + + public Address getAddress() { + return address; + } + + public void setAddress(Address address) { + this.address = address; + } +}

16 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r2240 - in trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping: abstractembeddedcomponents and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: mdryakhlenkov Date: 2007-07-02 12:36:45 -0400 (Mon, 02 Jul 2007) New Revision: 2240 Added: trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/abstractembeddedcomponents/propertyref/ trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/src/mapping/any/ Log:

16 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r2239 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core.

by jbosstools-commits＠lists.jboss.org

Author: akazakov Date: 2007-07-02 12:27:19 -0400 (Mon, 02 Jul 2007) New Revision: 2239 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamComponentMethodType.java Log: Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamComponentMethodType.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamComponentMethodType.java 2007-07-02 16:11:28 UTC (rev 2238) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamComponentMethodType.java 2007-07-02 16:27:19 UTC (rev 2239) @@ -14,6 +14,6 @@ * @author Alexey Kazakov */ public enum SeamComponentMethodType { - Create, - Destroy + CREATE, + DESTROY } \ No newline at end of file

16 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r2238 - in trunk/seam: plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core and 2 other directories.

by jbosstools-commits＠lists.jboss.org

Author: akazakov Date: 2007-07-02 12:11:28 -0400 (Mon, 02 Jul 2007) New Revision: 2238 Added: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamContextVariable.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamJavaClassSource.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamSource.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamTextSource.java Removed: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamModelObject.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamVariable.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamXmlElement.java Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/IBijectedAttribute.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/IRole.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamAnnotatedFactory.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamComponent.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamComponentMethod.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamFactory.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamProject.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamProperty.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamXmlFactory.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamComponent.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProperty.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/xml/XMLScanner.java trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/ScannerTest.java Log: http://jira.jboss.com/jira/browse/EXIN-216 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/IBijectedAttribute.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/IBijectedAttribute.java 2007-07-02 14:57:57 UTC (rev 2237) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/IBijectedAttribute.java 2007-07-02 16:11:28 UTC (rev 2238) @@ -15,20 +15,9 @@ /** * @author Alexey Kazakov */ -public interface IBijectedAttribute { +public interface IBijectedAttribute extends ISeamSource, ISeamContextVariable { /** - * @return name - */ - public String getName(); - - /** - * Sets name - * @param name - */ - public void setName(String name); - - /** * @return type */ public BijectedAttributeType getType(); @@ -36,5 +25,5 @@ /** * @return java source element */ - public IMember getJavaElement(); + public IMember getJavaSource(); } \ No newline at end of file Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/IRole.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/IRole.java 2007-07-02 14:57:57 UTC (rev 2237) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/IRole.java 2007-07-02 16:11:28 UTC (rev 2238) @@ -10,45 +10,9 @@ ******************************************************************************/ package org.jboss.tools.seam.core; -import org.eclipse.core.resources.IFile; - /** * @author Alexey Kazakov */ -public interface IRole { +public interface IRole extends ISeamJavaClassSource, ISeamTextSource, ISeamContextVariable { - /** - * @return Name - */ - public String getName(); - - /** - * Sets name - */ - public void setName(String name); - - /** - * @return scope type - */ - public ScopeType getScope(); - - /** - * Sets scope type - */ - public void setScope(ScopeType type); - - /** - * @return source file - */ - public IFile getSourceFile(); - - /** - * @return start position in source file - */ - public int getStartPosition(); - - /** - * @return length role definition in source file. - */ - public int getLength(); } \ No newline at end of file Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamAnnotatedFactory.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamAnnotatedFactory.java 2007-07-02 14:57:57 UTC (rev 2237) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamAnnotatedFactory.java 2007-07-02 16:11:28 UTC (rev 2238) @@ -15,7 +15,7 @@ /** * @author Alexey Kazakov */ -public interface ISeamAnnotatedFactory extends ISeamFactory { +public interface ISeamAnnotatedFactory extends ISeamFactory, ISeamSource { /** * @return source IMethod Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamComponent.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamComponent.java 2007-07-02 14:57:57 UTC (rev 2237) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamComponent.java 2007-07-02 16:11:28 UTC (rev 2238) @@ -13,22 +13,9 @@ import java.util.List; import java.util.Set; -import org.eclipse.jdt.core.IType; +public interface ISeamComponent extends ISeamContextVariable { -public interface ISeamComponent extends ISeamModelObject { - /** - * @return Name - */ - public String getName(); - - /** - * Sets name - * @param name - */ - public void setName(String name); - - /** * @return qualified Class name of component */ public String getClassName(); @@ -40,17 +27,6 @@ public void setClassName(String className); /** - * @return scope type - */ - public ScopeType getScope(); - - /** - * Sets scope type - * @param type - */ - public void setScope(ScopeType type); - - /** * @return bijected attributes */ public Set<IBijectedAttribute> getBijectedAttributes(); @@ -84,58 +60,50 @@ * @param propertyName * @return */ - public List<ISeamProperty<? extends Object>> getProperties(String propertyName); + public List<ISeamProperty> getProperties(String propertyName); /** + * Returns first property with propertyName from component.xml for that component. + * @param propertyName + * @return + */ + public ISeamProperty getProperty(String propertyName); + + /** * Returns properties by name from component.xml. * @param propertyName * @return */ - public Set<ISeamProperty<? extends Object>> getProperties(); + public Set<ISeamProperty> getProperties(); /** * Adds property to component. * @param property */ - public void addProperty(ISeamProperty<? extends Object> property); + public void addProperty(ISeamProperty property); /** * Removes property from component. * @param property */ - public void removeProperty(ISeamProperty<? extends Object> property); + public void removeProperty(ISeamProperty property); /** - * @return Set of Java source classes + * @return sources */ - public Set<IType> getJavaSourceClasses(); + public Set<ISeamSource> getSourceDeclarations(); /** - * @param sourceClass + * @param source */ - public void addJavaSourceClass(IType sourceClass); + public void addSourceDeclaration(ISeamSource source); /** - * @param sourceClass + * Removes source */ - public void removeJavaSourceClass(IType sourceClass); + public void removeSourceDeclaration(ISeamSource source); /** - * @return Set of source xml elements - */ - public Set<ISeamXmlElement> getXmlSourceElements(); - - /** - * @param element - */ - public void addmlSourceElement(ISeamXmlElement element); - - /** - * @param element - */ - public void removemlSourceElement(ISeamXmlElement element); - - /** * @return true if component marked as Stateful */ public boolean isStateful(); @@ -196,19 +164,19 @@ public void removeMethod(ISeamComponentMethod method); /** - * @return Factories methods and xml elements of component + * @return Factories methods of component */ - public Set<ISeamFactory> getFactories(); + public Set<ISeamAnnotatedFactory> getFactories(); /** - * Adds factory method or xml element + * Adds factory method * @param factory */ - public void addFactory(ISeamFactory factory); + public void addFactory(ISeamAnnotatedFactory factory); /** - * Remove factory method or xml element + * Remove factory method * @param factory */ - public void removeFactory(ISeamFactory factory); + public void removeFactory(ISeamAnnotatedFactory factory); } \ No newline at end of file Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamComponentMethod.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamComponentMethod.java 2007-07-02 14:57:57 UTC (rev 2237) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamComponentMethod.java 2007-07-02 16:11:28 UTC (rev 2238) @@ -15,7 +15,7 @@ /** * @author Alexey Kazakov */ -public interface ISeamComponentMethod { +public interface ISeamComponentMethod extends ISeamSource { /** * @return method type Copied: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamContextVariable.java (from rev 2217, trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamVariable.java) =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamContextVariable.java (rev 0) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamContextVariable.java 2007-07-02 16:11:28 UTC (rev 2238) @@ -0,0 +1,39 @@ + /******************************************************************************* + * 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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.seam.core; + +/** + * @author Alexey Kazakov + */ +public interface ISeamContextVariable { + + /** + * @return name + */ + public String getName(); + + /** + * Sets name + * @param name + */ + public void setName(String name); + + /** + * @return scope type + */ + public ScopeType getScope(); + + /** + * Sets scope type + * @param type + */ + public void setScope(ScopeType type); +} \ No newline at end of file Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamFactory.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamFactory.java 2007-07-02 14:57:57 UTC (rev 2237) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamFactory.java 2007-07-02 16:11:28 UTC (rev 2238) @@ -13,27 +13,6 @@ /** * @author Alexey Kazakov */ -public interface ISeamFactory { +public interface ISeamFactory extends ISeamContextVariable { - /** - * @return name - */ - public String getName(); - - /** - * Sets name - * @param name - */ - public void setName(String name); - - /** - * @return Scope type - */ - public ScopeType getScope(); - - /** - * Sets scope type - * @param type - */ - public void setScope(ScopeType type); } \ No newline at end of file Added: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamJavaClassSource.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamJavaClassSource.java (rev 0) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamJavaClassSource.java 2007-07-02 16:11:28 UTC (rev 2238) @@ -0,0 +1,21 @@ + /******************************************************************************* + * 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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.seam.core; + +import org.eclipse.jdt.core.IType; + +/** + * @author Alexey Kazakov + */ +public interface ISeamJavaClassSource extends ISeamSource { + + public IType getSourceClass(); +} \ No newline at end of file Deleted: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamModelObject.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamModelObject.java 2007-07-02 14:57:57 UTC (rev 2237) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamModelObject.java 2007-07-02 16:11:28 UTC (rev 2238) @@ -1,19 +0,0 @@ -/******************************************************************************* - * 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 - * - * Contributor: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.seam.core; - -public interface ISeamModelObject { - - /** - * @return ID of Model Object - */ - public String getId(); -} \ No newline at end of file Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamProject.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamProject.java 2007-07-02 14:57:57 UTC (rev 2237) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamProject.java 2007-07-02 16:11:28 UTC (rev 2238) @@ -37,12 +37,6 @@ public Set<ISeamComponent> getComponentsByClass(String className); /** - * @param id of component. - * @return ISeamComponent by model object ID. - */ - public ISeamComponent getComponent(String modelObjectId); - - /** * @return Set of ISeamComponents */ public Set<ISeamComponent> getComponents(); @@ -62,17 +56,17 @@ /** * @return all seam variables from all contexts. */ - public Set<ISeamVariable> getVariables(); + public Set<ISeamContextVariable> getVariables(); /** * @param name * @return all seam variables by name from all contexts */ - public Set<ISeamVariable> getVariablesByName(String name); + public Set<ISeamContextVariable> getVariablesByName(String name); /** * @param name * @return all seam variables from specific context */ - public Set<ISeamVariable> getVariablesByScope(ScopeType scope); + public Set<ISeamContextVariable> getVariablesByScope(ScopeType scope); } \ No newline at end of file Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamProperty.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamProperty.java 2007-07-02 14:57:57 UTC (rev 2237) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamProperty.java 2007-07-02 16:11:28 UTC (rev 2238) @@ -10,18 +10,25 @@ ******************************************************************************/ package org.jboss.tools.seam.core; -import org.eclipse.core.resources.IFile; - /** - * Seam Property defined in Component.xml + * Property of Seam Component defined in Component.xml or Properties.xml * @param <T> */ -public interface ISeamProperty<T extends Object> extends ISeamXmlElement { +public interface ISeamProperty extends ISeamTextSource { + /** + * @return name of property + */ public String getName(); - public T getValue(); - public String getStringValue(); + /** + * @return value of property + */ + public String getValue(); - public void setObject(Object value); + /** + * Sets value of property + * @param value + */ + public void setValue(String value); } \ No newline at end of file Added: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamSource.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamSource.java (rev 0) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamSource.java 2007-07-02 16:11:28 UTC (rev 2238) @@ -0,0 +1,19 @@ + /******************************************************************************* + * 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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.seam.core; + +/** + * @author Alexey Kazakov + * Represents source of ISeamModelObject + */ +public interface ISeamSource { + +} \ No newline at end of file Copied: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamTextSource.java (from rev 2215, trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamXmlElement.java) =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamTextSource.java (rev 0) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamTextSource.java 2007-07-02 16:11:28 UTC (rev 2238) @@ -0,0 +1,23 @@ + /******************************************************************************* + * 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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.seam.core; + +import org.eclipse.core.resources.IResource; + +/** + * @author Alexey Kazakov + */ +public interface ISeamTextSource extends ISeamSource { + + public IResource getResource(); + public int getStartPosition(); + public int getLength(); +} \ No newline at end of file Deleted: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamVariable.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamVariable.java 2007-07-02 14:57:57 UTC (rev 2237) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamVariable.java 2007-07-02 16:11:28 UTC (rev 2238) @@ -1,24 +0,0 @@ - /******************************************************************************* - * 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 - * - * Contributor: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.seam.core; - -/** - * @author Alexey Kazakov - */ -public interface ISeamVariable { - - /** - * @return name - */ - public String getName(); - -// TODO we should hold a link to source object (IBijectedAttribute, ISeamComponent, etc.) -} \ No newline at end of file Deleted: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamXmlElement.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamXmlElement.java 2007-07-02 14:57:57 UTC (rev 2237) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamXmlElement.java 2007-07-02 16:11:28 UTC (rev 2238) @@ -1,24 +0,0 @@ - /******************************************************************************* - * 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 - * - * Contributor: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.seam.core; - -import org.eclipse.core.resources.IResource; - -/** - * @author Alexey Kazakov - * TODO should we use WTP's stuff instead? - */ -public interface ISeamXmlElement { - - public IResource getResource(); - public int getStartPosition(); - public int getLength(); -} \ No newline at end of file Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamXmlFactory.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamXmlFactory.java 2007-07-02 14:57:57 UTC (rev 2237) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamXmlFactory.java 2007-07-02 16:11:28 UTC (rev 2238) @@ -13,7 +13,7 @@ /** * @author Alexey Kazakov */ -public interface ISeamXmlFactory extends ISeamFactory, ISeamXmlElement { +public interface ISeamXmlFactory extends ISeamFactory, ISeamTextSource { /** * @return value Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamComponent.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamComponent.java 2007-07-02 14:57:57 UTC (rev 2237) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamComponent.java 2007-07-02 16:11:28 UTC (rev 2238) @@ -16,20 +16,19 @@ import java.util.Set; import org.eclipse.core.runtime.IPath; -import org.eclipse.jdt.core.IType; import org.jboss.tools.seam.core.BijectedAttributeType; import org.jboss.tools.seam.core.IBijectedAttribute; import org.jboss.tools.seam.core.IRole; +import org.jboss.tools.seam.core.ISeamAnnotatedFactory; import org.jboss.tools.seam.core.ISeamComponent; import org.jboss.tools.seam.core.ISeamComponentMethod; -import org.jboss.tools.seam.core.ISeamFactory; import org.jboss.tools.seam.core.ISeamProperty; -import org.jboss.tools.seam.core.ISeamXmlElement; +import org.jboss.tools.seam.core.ISeamSource; import org.jboss.tools.seam.core.ScopeType; import org.jboss.tools.seam.core.SeamComponentMethodType; public class SeamComponent implements ISeamComponent { - protected Map<String,ISeamProperty<? extends Object>> properties = new HashMap<String, ISeamProperty<? extends Object>>(); + protected Map<String,ISeamProperty> properties = new HashMap<String, ISeamProperty>(); protected IPath source; public SeamComponent () { @@ -40,7 +39,7 @@ } public boolean getBooleanProperty(String propertyName) { - ISeamProperty<?> o = getProperty(propertyName); + ISeamProperty o = getProperty(propertyName); Object value = o.getValue(); if(value instanceof Boolean) return ((Boolean)value).booleanValue(); if(value instanceof String && "true".equals(value)); @@ -48,25 +47,25 @@ } public String getStringProperty(String propertyName) { - ISeamProperty<?> o = getProperty(propertyName); + ISeamProperty o = getProperty(propertyName); Object value = o.getValue(); return value == null ? null : value.toString(); } - public ISeamProperty<? extends Object> getProperty(String propertyName) { + public ISeamProperty getProperty(String propertyName) { return properties.get(propertyName); } - public void addProperty(ISeamProperty<? extends Object> property) { + public void addProperty(ISeamProperty property) { properties.put(property.getName(), property); } public void setStringProperty(String propertyName, String value) { - ISeamProperty<? extends Object> p = getProperty(propertyName); + ISeamProperty p = getProperty(propertyName); if(p == null) { - p = new SeamProperty<String>(propertyName, value); + p = new SeamProperty(propertyName, value); } else { - p.setObject(value); + p.setValue(value); } properties.put(propertyName, p); } @@ -75,30 +74,47 @@ source = path; } - /** - * @return ID of Seam Component. It's unique within Project. + /* (non-Javadoc) + * @see org.jboss.tools.seam.core.ISeamComponent#addBijectedAttribute(org.jboss.tools.seam.core.IBijectedAttribute) */ - public String getId() { - return getClassName() + ":" + getName(); + public void addBijectedAttribute(IBijectedAttribute attribute) { + // TODO Auto-generated method stub + } /* (non-Javadoc) - * @see org.jboss.tools.seam.core.ISeamComponent#addBijectedAttribute(org.jboss.tools.seam.core.IBijectedAttribute) + * @see org.jboss.tools.seam.core.ISeamComponent#addFactory(org.jboss.tools.seam.core.ISeamAnnotatedFactory) */ - public void addBijectedAttribute(IBijectedAttribute attribute) { + public void addFactory(ISeamAnnotatedFactory factory) { // TODO Auto-generated method stub } /* (non-Javadoc) - * @see org.jboss.tools.seam.core.ISeamComponent#addJavaSourceClass(org.eclipse.jdt.core.IType) + * @see org.jboss.tools.seam.core.ISeamComponent#addMethod(org.jboss.tools.seam.core.ISeamComponentMethod) */ - public void addJavaSourceClass(IType sourceClass) { + public void addMethod(ISeamComponentMethod method) { // TODO Auto-generated method stub } /* (non-Javadoc) + * @see org.jboss.tools.seam.core.ISeamComponent#addRole(org.jboss.tools.seam.core.IRole) + */ + public void addRole(IRole role) { + // TODO Auto-generated method stub + + } + + /* (non-Javadoc) + * @see org.jboss.tools.seam.core.ISeamComponent#addSourceDeclaration(org.jboss.tools.seam.core.ISeamSource) + */ + public void addSourceDeclaration(ISeamSource source) { + // TODO Auto-generated method stub + + } + + /* (non-Javadoc) * @see org.jboss.tools.seam.core.ISeamComponent#getBijectedAttributes() */ public Set<IBijectedAttribute> getBijectedAttributes() { @@ -131,216 +147,179 @@ return null; } - public void setClassName(String name) { - // TODO Auto-generated method stub - } - /* (non-Javadoc) - * @see org.jboss.tools.seam.core.ISeamComponent#getJavaSourceClasses() + * @see org.jboss.tools.seam.core.ISeamComponent#getFactories() */ - public Set<IType> getJavaSourceClasses() { + public Set<ISeamAnnotatedFactory> getFactories() { // TODO Auto-generated method stub return null; } /* (non-Javadoc) - * @see org.jboss.tools.seam.core.ISeamComponent#getName() + * @see org.jboss.tools.seam.core.ISeamComponent#getMethods() */ - public String getName() { + public Set<ISeamComponentMethod> getMethods() { // TODO Auto-generated method stub return null; } - public void setName(String name) { - // TODO Auto-generated method stub - } - /* (non-Javadoc) - * @see org.jboss.tools.seam.core.ISeamComponent#getProperties(java.lang.String) + * @see org.jboss.tools.seam.core.ISeamComponent#getMethodsByType(org.jboss.tools.seam.core.SeamComponentMethodType) */ - public List<ISeamProperty<? extends Object>> getProperties( - String propertyName) { + public Set<ISeamComponentMethod> getMethodsByType( + SeamComponentMethodType type) { // TODO Auto-generated method stub return null; } /* (non-Javadoc) - * @see org.jboss.tools.seam.core.ISeamComponent#getProperties() + * @see org.jboss.tools.seam.core.ISeamComponent#getRoles() */ - public Set<ISeamProperty<? extends Object>> getProperties() { + public Set<IRole> getRoles() { // TODO Auto-generated method stub return null; } /* (non-Javadoc) - * @see org.jboss.tools.seam.core.ISeamComponent#getScope() + * @see org.jboss.tools.seam.core.ISeamComponent#getSourceDeclarations() */ - public ScopeType getScope() { + public Set<ISeamSource> getSourceDeclarations() { // TODO Auto-generated method stub return null; } - public void setScope(ScopeType scope) { - // TODO Auto-generated method stub - } - /* (non-Javadoc) - * @see org.jboss.tools.seam.core.ISeamComponent#getXmlSourceElements() + * @see org.jboss.tools.seam.core.ISeamComponent#isEntity() */ - public Set<ISeamXmlElement> getXmlSourceElements() { + public boolean isEntity() { // TODO Auto-generated method stub - return null; + return false; } /* (non-Javadoc) - * @see org.jboss.tools.seam.core.ISeamComponent#addFactory(org.jboss.tools.seam.core.ISeamFactory) + * @see org.jboss.tools.seam.core.ISeamComponent#isStateful() */ - public void addFactory(ISeamFactory factory) { + public boolean isStateful() { // TODO Auto-generated method stub - + return false; } /* (non-Javadoc) - * @see org.jboss.tools.seam.core.ISeamComponent#addMethod(org.jboss.tools.seam.core.ISeamComponentMethod) + * @see org.jboss.tools.seam.core.ISeamComponent#removeBijectedAttribute(org.jboss.tools.seam.core.IBijectedAttribute) */ - public void addMethod(ISeamComponentMethod method) { + public void removeBijectedAttribute(IBijectedAttribute attribute) { // TODO Auto-generated method stub } /* (non-Javadoc) - * @see org.jboss.tools.seam.core.ISeamComponent#addRole(org.jboss.tools.seam.core.IRole) + * @see org.jboss.tools.seam.core.ISeamComponent#removeFactory(org.jboss.tools.seam.core.ISeamAnnotatedFactory) */ - public void addRole(IRole role) { + public void removeFactory(ISeamAnnotatedFactory factory) { // TODO Auto-generated method stub } /* (non-Javadoc) - * @see org.jboss.tools.seam.core.ISeamComponent#addmlSourceElement(org.jboss.tools.seam.core.ISeamXmlElement) + * @see org.jboss.tools.seam.core.ISeamComponent#removeMethod(org.jboss.tools.seam.core.ISeamComponentMethod) */ - public void addmlSourceElement(ISeamXmlElement element) { + public void removeMethod(ISeamComponentMethod method) { // TODO Auto-generated method stub } /* (non-Javadoc) - * @see org.jboss.tools.seam.core.ISeamComponent#getFactories() + * @see org.jboss.tools.seam.core.ISeamComponent#removeRole(org.jboss.tools.seam.core.IRole) */ - public Set<ISeamFactory> getFactories() { + public void removeRole(IRole role) { // TODO Auto-generated method stub - return null; + } /* (non-Javadoc) - * @see org.jboss.tools.seam.core.ISeamComponent#getMethods() + * @see org.jboss.tools.seam.core.ISeamComponent#removeSourceDeclaration(org.jboss.tools.seam.core.ISeamSource) */ - public Set<ISeamComponentMethod> getMethods() { + public void removeSourceDeclaration(ISeamSource source) { // TODO Auto-generated method stub - return null; + } /* (non-Javadoc) - * @see org.jboss.tools.seam.core.ISeamComponent#getMethodsByType(org.jboss.tools.seam.core.SeamComponentMethodType) + * @see org.jboss.tools.seam.core.ISeamComponent#setClassName(java.lang.String) */ - public Set<ISeamComponentMethod> getMethodsByType( - SeamComponentMethodType type) { + public void setClassName(String className) { // TODO Auto-generated method stub - return null; + } /* (non-Javadoc) - * @see org.jboss.tools.seam.core.ISeamComponent#getRoles() + * @see org.jboss.tools.seam.core.ISeamComponent#setEntity(boolean) */ - public Set<IRole> getRoles() { + public void setEntity(boolean entity) { // TODO Auto-generated method stub - return null; - } - - /* (non-Javadoc) - * @see org.jboss.tools.seam.core.ISeamComponent#isEntity() - */ - public boolean isEntity() { - // TODO Auto-generated method stub - return false; - } - - /* (non-Javadoc) - * @see org.jboss.tools.seam.core.ISeamComponent#isStateful() - */ - public boolean isStateful() { - // TODO Auto-generated method stub - return false; - } - - /* (non-Javadoc) - * @see org.jboss.tools.seam.core.ISeamComponent#removeBijectedAttribute(org.jboss.tools.seam.core.IBijectedAttribute) - */ - public void removeBijectedAttribute(IBijectedAttribute attribute) { - // TODO Auto-generated method stub } /* (non-Javadoc) - * @see org.jboss.tools.seam.core.ISeamComponent#removeFactory(org.jboss.tools.seam.core.ISeamFactory) + * @see org.jboss.tools.seam.core.ISeamComponent#setStateful(boolean) */ - public void removeFactory(ISeamFactory factory) { + public void setStateful(boolean stateful) { // TODO Auto-generated method stub } /* (non-Javadoc) - * @see org.jboss.tools.seam.core.ISeamComponent#removeJavaSourceClass(org.eclipse.jdt.core.IType) + * @see org.jboss.tools.seam.core.ISeamContextVariable#getName() */ - public void removeJavaSourceClass(IType sourceClass) { + public String getName() { // TODO Auto-generated method stub - + return null; } /* (non-Javadoc) - * @see org.jboss.tools.seam.core.ISeamComponent#removeMethod(org.jboss.tools.seam.core.ISeamComponentMethod) + * @see org.jboss.tools.seam.core.ISeamContextVariable#getScope() */ - public void removeMethod(ISeamComponentMethod method) { + public ScopeType getScope() { // TODO Auto-generated method stub - + return null; } /* (non-Javadoc) - * @see org.jboss.tools.seam.core.ISeamComponent#removeProperty(org.jboss.tools.seam.core.ISeamProperty) + * @see org.jboss.tools.seam.core.ISeamContextVariable#setName(java.lang.String) */ - public void removeProperty(ISeamProperty<? extends Object> property) { + public void setName(String name) { // TODO Auto-generated method stub } /* (non-Javadoc) - * @see org.jboss.tools.seam.core.ISeamComponent#removeRole(org.jboss.tools.seam.core.IRole) + * @see org.jboss.tools.seam.core.ISeamContextVariable#setScope(org.jboss.tools.seam.core.ScopeType) */ - public void removeRole(IRole role) { + public void setScope(ScopeType type) { // TODO Auto-generated method stub } /* (non-Javadoc) - * @see org.jboss.tools.seam.core.ISeamComponent#removemlSourceElement(org.jboss.tools.seam.core.ISeamXmlElement) + * @see org.jboss.tools.seam.core.ISeamComponent#getProperties(java.lang.String) */ - public void removemlSourceElement(ISeamXmlElement element) { + public List<ISeamProperty> getProperties(String propertyName) { // TODO Auto-generated method stub - + return null; } /* (non-Javadoc) - * @see org.jboss.tools.seam.core.ISeamComponent#setEntity(boolean) + * @see org.jboss.tools.seam.core.ISeamComponent#getProperties() */ - public void setEntity(boolean entity) { + public Set<ISeamProperty> getProperties() { // TODO Auto-generated method stub - + return null; } /* (non-Javadoc) - * @see org.jboss.tools.seam.core.ISeamComponent#setStateful(boolean) + * @see org.jboss.tools.seam.core.ISeamComponent#removeProperty(org.jboss.tools.seam.core.ISeamProperty) */ - public void setStateful(boolean stateful) { + public void removeProperty(ISeamProperty property) { // TODO Auto-generated method stub } Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java 2007-07-02 14:57:57 UTC (rev 2237) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java 2007-07-02 16:11:28 UTC (rev 2238) @@ -21,7 +21,7 @@ import org.eclipse.core.runtime.IPath; import org.jboss.tools.seam.core.ISeamComponent; import org.jboss.tools.seam.core.ISeamProject; -import org.jboss.tools.seam.core.ISeamVariable; +import org.jboss.tools.seam.core.ISeamContextVariable; import org.jboss.tools.seam.core.ScopeType; /** @@ -152,7 +152,7 @@ /* (non-Javadoc) * @see org.jboss.tools.seam.core.ISeamProject#getVariables() */ - public Set<ISeamVariable> getVariables() { + public Set<ISeamContextVariable> getVariables() { // TODO Auto-generated method stub return null; } @@ -160,7 +160,7 @@ /* (non-Javadoc) * @see org.jboss.tools.seam.core.ISeamProject#getVariablesByName(java.lang.String) */ - public Set<ISeamVariable> getVariablesByName(String name) { + public Set<ISeamContextVariable> getVariablesByName(String name) { // TODO Auto-generated method stub return null; } @@ -168,7 +168,7 @@ /* (non-Javadoc) * @see org.jboss.tools.seam.core.ISeamProject#getVariablesByScope(org.jboss.tools.seam.core.ScopeType) */ - public Set<ISeamVariable> getVariablesByScope(ScopeType scope) { + public Set<ISeamContextVariable> getVariablesByScope(ScopeType scope) { // TODO Auto-generated method stub return null; } Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProperty.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProperty.java 2007-07-02 14:57:57 UTC (rev 2237) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProperty.java 2007-07-02 16:11:28 UTC (rev 2238) @@ -10,23 +10,22 @@ ******************************************************************************/ package org.jboss.tools.seam.internal.core; -import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IResource; import org.jboss.tools.seam.core.ISeamProperty; -public class SeamProperty<T extends Object> implements ISeamProperty<T> { +public class SeamProperty implements ISeamProperty { protected String name; - protected T value; + protected String value; protected int startPosition = -1; protected int length = -1; - + public SeamProperty() {} - + public SeamProperty(String name) { this.name = name; } - public SeamProperty(String name, T value) { + public SeamProperty(String name, String value) { this.name = name; this.value = value; } @@ -51,23 +50,14 @@ length = v; } - public String getStringValue() { - Object value = getValue(); - return value == null ? null : value.toString(); - } - - public T getValue() { + public String getValue() { return value; } - public void setValue(T value) { + public void setValue(String value) { this.value = value; } - public void setObject(Object value) { - this.value = (T)value; - } - /* (non-Javadoc) * @see org.jboss.tools.seam.core.ISeamXmlElement#getResource() */ Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/xml/XMLScanner.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/xml/XMLScanner.java 2007-07-02 14:57:57 UTC (rev 2237) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/xml/XMLScanner.java 2007-07-02 16:11:28 UTC (rev 2238) @@ -22,9 +22,7 @@ import org.jboss.tools.common.meta.XModelEntity; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.util.EclipseResourceUtil; -import org.jboss.tools.seam.core.ISeamComponent; import org.jboss.tools.seam.internal.core.SeamComponent; -import org.jboss.tools.seam.internal.core.SeamProperty; import org.jboss.tools.seam.internal.core.scanner.IFileScanner; public class XMLScanner implements IFileScanner { @@ -128,7 +126,7 @@ for (int k = 0; k < entries.length; k++) { listValues.add(entries[k].getAttributeValue("value")); } - component.addProperty(new SeamProperty<List<String>>(propertyName, listValues)); +// component.addProperty(new SeamProperty<List<String>>(propertyName, listValues)); } else { //this is map value Map<String,String> mapValues = new HashMap<String, String>(); @@ -137,7 +135,7 @@ String entryValue = entries[k].getAttributeValue("value"); mapValues.put(entryKey, entryValue); } - component.addProperty(new SeamProperty<Map<String,String>>(propertyName, mapValues)); +// component.addProperty(new SeamProperty<Map<String,String>>(propertyName, mapValues)); } } //TODO assign positioning attributes to created ISeamProperty object @@ -157,8 +155,7 @@ list.add(component); } } - + return list.toArray(new SeamComponent[0]); } - -} +} \ No newline at end of file Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/ScannerTest.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/ScannerTest.java 2007-07-02 14:57:57 UTC (rev 2237) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/ScannerTest.java 2007-07-02 16:11:28 UTC (rev 2238) @@ -89,9 +89,9 @@ for (Iterator iterator = components.iterator(); iterator.hasNext();) { ISeamComponent c = (ISeamComponent) iterator.next(); //We have list property in this component - List<ISeamProperty<?>> prs = c.getProperties("myList"); + List<ISeamProperty> prs = c.getProperties("myList"); assertTrue("Property myList is not found in components.xml", prs.size() == 1); - ISeamProperty<?> property = prs.get(0); + ISeamProperty property = prs.get(0); Object o = property.getValue(); assertTrue("Property myList in myComponent must be instanceof java.util.List.", o instanceof List); List<?> oList = (List<?>)o;

16 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r2237 - trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/META-INF.

by jbosstools-commits＠lists.jboss.org

Author: dazarov Date: 2007-07-02 10:57:57 -0400 (Mon, 02 Jul 2007) New Revision: 2237 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/META-INF/MANIFEST.MF Log: Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/META-INF/MANIFEST.MF =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/META-INF/MANIFEST.MF 2007-07-02 14:56:20 UTC (rev 2236) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/META-INF/MANIFEST.MF 2007-07-02 14:57:57 UTC (rev 2237) @@ -14,7 +14,8 @@ org.eclipse.ui.editors, org.eclipse.core.resources, org.hibernate.eclipse, - org.jboss.tools.hibernate.ui.view + org.jboss.tools.hibernate.ui.view, + org.jboss.tools.common Bundle-Version: 2.0.0 Export-Package: org.jboss.tools.hibernate.veditor, org.jboss.tools.hibernate.veditor.editors,

16 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r2236 - trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/model.

by jbosstools-commits＠lists.jboss.org

Author: dazarov Date: 2007-07-02 10:56:20 -0400 (Mon, 02 Jul 2007) New Revision: 2236 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/model/ComponentShape.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/model/ExpandeableShape.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/model/ModelElement.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/model/OrmDiagram.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/model/OrmShape.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/model/SpecialOrmShape.java Log: Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/model/ComponentShape.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/model/ComponentShape.java 2007-07-02 12:47:49 UTC (rev 2235) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/model/ComponentShape.java 2007-07-02 14:56:20 UTC (rev 2236) @@ -36,22 +36,22 @@ Collection collection = (Collection)((Property)ioe).getValue(); bodyOrmShape = new Shape(collection.getKey()); bodyOrmShape.setIndent(20); - shapes.add(bodyOrmShape); + getChildren().add(bodyOrmShape); bodyOrmShape = new Shape(collection.getElement()); bodyOrmShape.setIndent(20); - shapes.add(bodyOrmShape); + getChildren().add(bodyOrmShape); } } protected void setChildsHiden(boolean hiden) { - for (int i = 0; i < shapes.size(); i++) - ((Shape)shapes.get(i)).setHiden(hiden); + for (int i = 0; i < getChildren().size(); i++) + ((Shape)getChildren().get(i)).setHiden(hiden); } public void refreshChildsHiden(OrmDiagram ormDiagram) { childsHiden = !childsHiden; - for (int i = 0; i < shapes.size(); i++) - ((Shape)shapes.get(i)).setHiden(childsHiden); + for (int i = 0; i < getChildren().size(); i++) + ((Shape)getChildren().get(i)).setHiden(childsHiden); firePropertyChange(SET_CHILDS_HIDEN, null, new Boolean(childsHiden)); ormDiagram.refreshComponentReferences(this); } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/model/ExpandeableShape.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/model/ExpandeableShape.java 2007-07-02 12:47:49 UTC (rev 2235) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/model/ExpandeableShape.java 2007-07-02 14:56:20 UTC (rev 2236) @@ -27,12 +27,7 @@ public static final String SHOW_REFERENCES = "show references"; private boolean refHide = false; - protected List<Shape> shapes = new ArrayList<Shape>(); - public List<Shape> getChildren() { - return shapes; - } - public ExpandeableShape(Object ioe) { super(ioe); } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/model/ModelElement.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/model/ModelElement.java 2007-07-02 12:47:49 UTC (rev 2235) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/model/ModelElement.java 2007-07-02 14:56:20 UTC (rev 2236) @@ -12,6 +12,8 @@ import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; +import java.util.ArrayList; +import java.util.List; /** * @author Konstantin Mishin @@ -39,5 +41,36 @@ pcsDelegate.removePropertyChangeListener(l); } } + + private List children = new OList(); + private ModelElement parent; + + public List getChildren(){ + return children; + } + + public ModelElement getParent(){ + return parent; + } + + public void setParent(ModelElement element){ + parent = element; + } + + class OList extends ArrayList{ + public OList(){ + + } + + public boolean add(Object item){ + if(item instanceof ModelElement)((ModelElement)item).setParent(ModelElement.this); + return super.add(item); + } + + public boolean remove(Object item){ + if(item instanceof ModelElement)((ModelElement)item).setParent(null); + return super.remove(item); + } + } } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/model/OrmDiagram.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/model/OrmDiagram.java 2007-07-02 12:47:49 UTC (rev 2235) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/model/OrmDiagram.java 2007-07-02 14:56:20 UTC (rev 2236) @@ -57,7 +57,6 @@ private boolean dirty = false; private String childrenLocations[]; private IResource resource = null; - private List<Shape> shapes = new ArrayList<Shape>(); private HashMap<String,OrmShape> elements = new HashMap<String,OrmShape>(); private RootClass ormElement; private Configuration configuration; @@ -89,10 +88,6 @@ } - public List getChildren() { - return shapes; - } - public HashMap getCloneElements() { return (HashMap)elements.clone(); } @@ -103,7 +98,7 @@ public void refresh() { saveHelper(); - shapes.clear(); + getChildren().clear(); elements.clear(); // if( ((IPersistentClass)ormElement).getProjectMapping().findClass(ormElement.getName()) != null) /// getOrCreatePersistentClass((IPersistentClass)ormElement, null); @@ -130,9 +125,9 @@ } private void saveHelper() { - childrenLocations = new String[shapes.size()]; - for (int i = 0; i < shapes.size(); i++) { - OrmShape shape = (OrmShape) shapes.get(i); + childrenLocations = new String[getChildren().size()]; + for (int i = 0; i < getChildren().size(); i++) { + OrmShape shape = (OrmShape) getChildren().get(i); Object ormElement = shape.getOrmElement(); if (ormElement instanceof RootClass) { childrenLocations[i] = ((RootClass)ormElement).getClassName() + "@"; @@ -149,24 +144,24 @@ OrmShape ormShape = null; if (ormElement instanceof RootClass) { ormShape = new OrmShape(ormElement); - shapes.add(ormShape); + getChildren().add(ormShape); elements.put(((RootClass)ormElement).getClassName(), ormShape); } else if (ormElement instanceof Table) { ormShape = new OrmShape(ormElement); - shapes.add(ormShape); + getChildren().add(ormShape); Table table = (Table)ormElement; elements.put(table.getSchema() + "." + table.getName(), ormShape); } else if (ormElement instanceof Property) { // ormShape = new OrmShape(ormElement); SpecialRootClass specialRootClass = new SpecialRootClass((Property)ormElement); ormShape = new SpecialOrmShape(specialRootClass); - shapes.add(ormShape); + getChildren().add(ormShape); // Property property = (Property)ormElement; // elements.put(property.getPersistentClass().getEntityName() + "." + property.getName(), ormShape); elements.put(specialRootClass.getClassName(), ormShape); } else if (ormElement instanceof SingleTableSubclass) { ormShape = new OrmShape(ormElement); - shapes.add(ormShape); + getChildren().add(ormShape); elements.put(((SingleTableSubclass)ormElement).getEntityName(), ormShape); } return ormShape; @@ -334,10 +329,10 @@ } else if (collection.isMap()) { Map map = (Map)collection; OrmShape childShape = getOrCreateDatabaseTable(map.getCollectionTable()); - Shape keyShape = childShape.getChild(((DependantValue)componentShape.getChildren().get(0).getOrmElement()).getColumnIterator().next()); - new Connection(componentShape.getChildren().get(0), keyShape); - Shape elementShape = childShape.getChild(((SimpleValue)componentShape.getChildren().get(1).getOrmElement()).getColumnIterator().next()); - new Connection(componentShape.getChildren().get(1), elementShape); + Shape keyShape = childShape.getChild(((DependantValue)((Shape)componentShape.getChildren().get(0)).getOrmElement()).getColumnIterator().next()); + new Connection((Shape)componentShape.getChildren().get(0), keyShape); + Shape elementShape = childShape.getChild(((SimpleValue)((Shape)componentShape.getChildren().get(1)).getOrmElement()).getColumnIterator().next()); + new Connection((Shape)componentShape.getChildren().get(1), elementShape); } setDirty(true); firePropertyChange(REFRESH, null, null); Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/model/OrmShape.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/model/OrmShape.java 2007-07-02 12:47:49 UTC (rev 2235) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/model/OrmShape.java 2007-07-02 14:56:20 UTC (rev 2236) @@ -46,7 +46,7 @@ RootClass rootClass = (RootClass)getOrmElement(); Property identifierProperty = rootClass.getIdentifierProperty(); if (identifierProperty != null) { - shapes.add(new Shape(identifierProperty)); + getChildren().add(new Shape(identifierProperty)); } KeyValue identifier = rootClass.getIdentifier(); @@ -54,7 +54,7 @@ Iterator iterator = ((Component)identifier).getPropertyIterator(); while (iterator.hasNext()) { Property property = (Property) iterator.next(); - shapes.add(new Shape(property)); + getChildren().add(new Shape(property)); } } @@ -69,7 +69,7 @@ } else { bodyOrmShape = new Shape(field); } - shapes.add(bodyOrmShape); + getChildren().add(bodyOrmShape); } else { Component component = (Component)field.getValue(); Iterator iter = component.getPropertyIterator(); @@ -82,7 +82,7 @@ } else { bodyOrmShape = new Shape(property); } - shapes.add(bodyOrmShape); + getChildren().add(bodyOrmShape); } } } @@ -98,7 +98,7 @@ } else { bodyOrmShape = new Shape(field); } - shapes.add(bodyOrmShape); + getChildren().add(bodyOrmShape); } else { Component component = (Component)field.getValue(); Iterator iter = component.getPropertyIterator(); @@ -111,7 +111,7 @@ } else { bodyOrmShape = new Shape(property); } - shapes.add(bodyOrmShape); + getChildren().add(bodyOrmShape); } } } @@ -120,7 +120,7 @@ while (iterator.hasNext()) { Column column = (Column)iterator.next(); bodyOrmShape = new Shape(column); - shapes.add(bodyOrmShape); + getChildren().add(bodyOrmShape); } } } @@ -140,14 +140,14 @@ protected void setHiden(boolean hiden) { super.setHiden(hiden); - for (int i = 0; i < shapes.size(); i++) - ((Shape)shapes.get(i)).setHiden(hiden); + for (int i = 0; i < getChildren().size(); i++) + ((Shape)getChildren().get(i)).setHiden(hiden); } public void refreshHiden() { hiden = !hiden; - for (int i = 0; i < shapes.size(); i++) - ((Shape)shapes.get(i)).setHiden(hiden); + for (int i = 0; i < getChildren().size(); i++) + ((Shape)getChildren().get(i)).setHiden(hiden); firePropertyChange(SET_HIDEN, null, new Boolean(hiden)); } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/model/SpecialOrmShape.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/model/SpecialOrmShape.java 2007-07-02 12:47:49 UTC (rev 2235) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/model/SpecialOrmShape.java 2007-07-02 14:56:20 UTC (rev 2236) @@ -26,12 +26,12 @@ Shape bodyOrmShape; RootClass rootClass = (RootClass)getOrmElement(); Property identifierProperty = rootClass.getIdentifierProperty(); - if (identifierProperty != null) shapes.add(new Shape(identifierProperty)); + if (identifierProperty != null) getChildren().add(new Shape(identifierProperty)); SpecialRootClass src = (SpecialRootClass)getOrmElement(); if (src.getParentProperty() != null) { bodyOrmShape = new Shape(src.getParentProperty()); - shapes.add(bodyOrmShape); + getChildren().add(bodyOrmShape); parentShape = bodyOrmShape; } @@ -45,7 +45,7 @@ } else { bodyOrmShape = new Shape(field); } - shapes.add(bodyOrmShape); + getChildren().add(bodyOrmShape); } }

16 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r2235 - trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/parts.

by jbosstools-commits＠lists.jboss.org

Author: dazarov Date: 2007-07-02 08:47:49 -0400 (Mon, 02 Jul 2007) New Revision: 2235 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/parts/ExpandeableShapeEditPart.java Log: Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/parts/ExpandeableShapeEditPart.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/parts/ExpandeableShapeEditPart.java 2007-07-02 11:33:48 UTC (rev 2234) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/parts/ExpandeableShapeEditPart.java 2007-07-02 12:47:49 UTC (rev 2235) @@ -43,11 +43,15 @@ public void propertyChange(PropertyChangeEvent evt) { String prop = evt.getPropertyName(); if (Shape.SHOW_SELECTION.equals(prop)) { - ((IFigure)getFigure().getChildren().get(0)).setBackgroundColor(getSelectionColor()); - ((IFigure)getFigure().getChildren().get(0)).setForegroundColor(ResourceManager.getInstance().getColor(new RGB(255,255,255))); + if(getFigure().getChildren().size() > 0){ + ((IFigure)getFigure().getChildren().get(0)).setBackgroundColor(getSelectionColor()); + ((IFigure)getFigure().getChildren().get(0)).setForegroundColor(ResourceManager.getInstance().getColor(new RGB(255,255,255))); + } } else if (Shape.HIDE_SELECTION.equals(prop)) { - ((IFigure)getFigure().getChildren().get(0)).setBackgroundColor(getColor()); - ((IFigure)getFigure().getChildren().get(0)).setForegroundColor(ResourceManager.getInstance().getColor(new RGB(0,0,0))); + if(getFigure().getChildren().size() > 0){ + ((IFigure)getFigure().getChildren().get(0)).setBackgroundColor(getColor()); + ((IFigure)getFigure().getChildren().get(0)).setForegroundColor(ResourceManager.getInstance().getColor(new RGB(0,0,0))); + } }else if (ExpandeableShape.SHOW_REFERENCES.equals(prop)) { // ((IFigure)getFigure().getChildren().get(0)).setBackgroundColor(getSelectionColor()); // ((IFigure)getFigure().getChildren().get(0)).setForegroundColor(ResourceManager.getInstance().getColor(new RGB(255,255,255)));

16 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r2234 - trunk/seam/plugins/org.jboss.tools.seam.ui.

by jbosstools-commits＠lists.jboss.org

Author: akazakov Date: 2007-07-02 07:33:48 -0400 (Mon, 02 Jul 2007) New Revision: 2234 Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/.classpath Log: removed org.eclipse.swt project dependency Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/.classpath =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/.classpath 2007-07-02 11:13:32 UTC (rev 2233) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/.classpath 2007-07-02 11:33:48 UTC (rev 2234) @@ -3,6 +3,5 @@ <classpathentry kind="src" path="src"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.swt"/> <classpathentry kind="output" path="bin"/> </classpath>

16 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r2233 - trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/model.

by jbosstools-commits＠lists.jboss.org

Author: mdryakhlenkov Date: 2007-07-02 07:13:32 -0400 (Mon, 02 Jul 2007) New Revision: 2233 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/model/OrmDiagram.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/model/OrmShape.java Log: Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/model/OrmDiagram.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/model/OrmDiagram.java 2007-06-30 14:52:03 UTC (rev 2232) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/model/OrmDiagram.java 2007-07-02 11:13:32 UTC (rev 2233) @@ -186,6 +186,13 @@ createConnections(classShape, shape); new Connection(classShape, shape); } + RootClass rc = (RootClass)persistentClass; + Iterator iter = rc.getSubclassIterator(); + while (iter.hasNext()) { + SingleTableSubclass singleTableSubclass = (SingleTableSubclass)iter.next(); + classShape = elements.get(singleTableSubclass.getEntityPersisterClass().getCanonicalName()); + if (classShape == null) classShape = createShape(singleTableSubclass); + } // if (persistentClass.getPersistentClassMapping() != null) { // Iterator iter =((IHibernateClassMapping)(persistentClass).getPersistentClassMapping()).getJoinIterator(); // while ( iter.hasNext() ) { @@ -217,9 +224,9 @@ if (elements.get(cls.getClassName()) == null) getOrCreatePersistentClass(cls, null); } - } else if (clazz instanceof SingleTableSubclass) { - SingleTableSubclass singleTableSubclass = (SingleTableSubclass)clazz; - getOrCreatePersistentClass(singleTableSubclass, null); +// } else if (clazz instanceof SingleTableSubclass) { +// SingleTableSubclass singleTableSubclass = (SingleTableSubclass)clazz; +// getOrCreatePersistentClass(singleTableSubclass, null); } } // IPersistentClassMapping persistentClassMappings[] = databaseTable.getPersistentClassMappings(); Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/model/OrmShape.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/model/OrmShape.java 2007-06-30 14:52:03 UTC (rev 2232) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/model/OrmShape.java 2007-07-02 11:13:32 UTC (rev 2233) @@ -19,6 +19,7 @@ import org.hibernate.mapping.KeyValue; import org.hibernate.mapping.Property; import org.hibernate.mapping.RootClass; +import org.hibernate.mapping.SimpleValue; import org.hibernate.mapping.SingleTableSubclass; import org.hibernate.mapping.Table; @@ -60,27 +61,59 @@ Iterator iterator = rootClass.getPropertyIterator(); while (iterator.hasNext()) { Property field = (Property)iterator.next(); - if (field.getValue().getType().isEntityType()) { - bodyOrmShape = new ExpandeableShape(field); - } else if (field.getValue().getType().isCollectionType()) { - bodyOrmShape = new ComponentShape(field); + if (!field.isComposite()) { + if (field.getValue().getType().isEntityType()) { + bodyOrmShape = new ExpandeableShape(field); + } else if (field.getValue().getType().isCollectionType()) { + bodyOrmShape = new ComponentShape(field); + } else { + bodyOrmShape = new Shape(field); + } + shapes.add(bodyOrmShape); } else { - bodyOrmShape = new Shape(field); + Component component = (Component)field.getValue(); + Iterator iter = component.getPropertyIterator(); + while (iter.hasNext()) { + Property property = (Property)iter.next(); + if (property.getValue().getType().isEntityType()) { + bodyOrmShape = new ExpandeableShape(property); + } else if (property.getValue().getType().isCollectionType()) { + bodyOrmShape = new ComponentShape(property); + } else { + bodyOrmShape = new Shape(property); + } + shapes.add(bodyOrmShape); + } } - shapes.add(bodyOrmShape); } } else if (ormElement instanceof SingleTableSubclass) { Iterator iterator = ((SingleTableSubclass)ormElement).getRootClass().getPropertyIterator(); while (iterator.hasNext()) { Property field = (Property)iterator.next(); - if (field.getValue().getType().isEntityType()) { - bodyOrmShape = new ExpandeableShape(field); - } else if (field.getValue().getType().isCollectionType()) { - bodyOrmShape = new ComponentShape(field); + if (!field.isComposite()) { + if (field.getValue().getType().isEntityType()) { + bodyOrmShape = new ExpandeableShape(field); + } else if (field.getValue().getType().isCollectionType()) { + bodyOrmShape = new ComponentShape(field); + } else { + bodyOrmShape = new Shape(field); + } + shapes.add(bodyOrmShape); } else { - bodyOrmShape = new Shape(field); + Component component = (Component)field.getValue(); + Iterator iter = component.getPropertyIterator(); + while (iter.hasNext()) { + Property property = (Property)iter.next(); + if (property.getValue().getType().isEntityType()) { + bodyOrmShape = new ExpandeableShape(property); + } else if (property.getValue().getType().isCollectionType()) { + bodyOrmShape = new ComponentShape(property); + } else { + bodyOrmShape = new Shape(property); + } + shapes.add(bodyOrmShape); + } } - shapes.add(bodyOrmShape); } } else if (ormElement instanceof Table) { Iterator iterator = ((Table)getOrmElement()).getColumnIterator();

16 years, 9 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits July 2007