Author: alexsmirnov
Date: 2010-03-07 23:03:00 -0500 (Sun, 07 Mar 2010)
New Revision: 16534
Added:
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/PropertyAdapter.java
Modified:
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/AttributeAdapter.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/AttributeBean.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/PropertyBase.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/PropertyBean.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/package-info.java
Log:
CODING IN PROGRESS - issue RF-7736: Library model verifier.
https://jira.jboss.org/jira/browse/RF-7736
Modified:
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/AttributeAdapter.java
===================================================================
---
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/AttributeAdapter.java 2010-03-07
18:24:15 UTC (rev 16533)
+++
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/AttributeAdapter.java 2010-03-08
04:03:00 UTC (rev 16534)
@@ -24,23 +24,22 @@
package org.richfaces.cdk.xmlconfig.model;
import org.richfaces.cdk.model.AttributeModel;
-import org.richfaces.cdk.model.Property;
/**
* <p class="changed_added_4_0"></p>
* @author asmirnov(a)exadel.com
*
*/
-public class AttributeAdapter extends AdapterBase<PropertyBase , Property> {
+public class AttributeAdapter extends AdapterBase<AttributeBean , AttributeModel>
{
@Override
- protected Class<? extends PropertyBase> getBeanClass(Property prop) {
- return prop instanceof AttributeModel ? AttributeBean.class :
PropertyBean.class;
+ protected Class<? extends AttributeBean> getBeanClass(AttributeModel prop) {
+ return AttributeBean.class;
}
@Override
- protected Class<? extends Property> getModelClass(PropertyBase bean) {
- return bean instanceof AttributeBean ? AttributeModel.class : Property.class;
+ protected Class<? extends AttributeModel> getModelClass(AttributeBean bean) {
+ return AttributeModel.class;
}
}
Modified:
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/AttributeBean.java
===================================================================
---
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/AttributeBean.java 2010-03-07
18:24:15 UTC (rev 16533)
+++
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/AttributeBean.java 2010-03-08
04:03:00 UTC (rev 16534)
@@ -36,7 +36,7 @@
* @author asmirnov(a)exadel.com
*/
@XmlType(name = "faces-config-attributeType", namespace =
ComponentLibrary.FACES_CONFIG_NAMESPACE,
- propOrder = {"key", "type", "defaultValue",
"suggestedValue", "extension"})
+ propOrder = {"name", "type", "defaultValue",
"suggestedValue", "extension"})
@XmlJavaTypeAdapter(AttributeAdapter.class)
public class AttributeBean extends PropertyBase {
@@ -46,8 +46,8 @@
* @return the name
*/
@XmlElement(name = "attribute-name", namespace =
ComponentLibrary.FACES_CONFIG_NAMESPACE, required = true)
- public String getKey() {
- return super.getKey();
+ public String getName() {
+ return super.getName();
}
/**
Added:
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/PropertyAdapter.java
===================================================================
---
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/PropertyAdapter.java
(rev 0)
+++
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/PropertyAdapter.java 2010-03-08
04:03:00 UTC (rev 16534)
@@ -0,0 +1,45 @@
+/*
+ * $Id$
+ *
+ * License Agreement.
+ *
+ * Rich Faces - Natural Ajax for Java Server Faces (JSF)
+ *
+ * Copyright (C) 2007 Exadel, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+package org.richfaces.cdk.xmlconfig.model;
+
+import org.richfaces.cdk.model.Property;
+
+/**
+ * <p class="changed_added_4_0"></p>
+ * @author asmirnov(a)exadel.com
+ *
+ */
+public class PropertyAdapter extends AdapterBase<PropertyBean , Property> {
+
+ @Override
+ protected Class<? extends PropertyBean> getBeanClass(Property prop) {
+ return PropertyBean.class;
+ }
+
+ @Override
+ protected Class<? extends Property> getModelClass(PropertyBean bean) {
+ return Property.class;
+ }
+
+}
Property changes on:
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/PropertyAdapter.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Modified:
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/PropertyBase.java
===================================================================
---
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/PropertyBase.java 2010-03-07
18:24:15 UTC (rev 16533)
+++
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/PropertyBase.java 2010-03-08
04:03:00 UTC (rev 16534)
@@ -43,7 +43,7 @@
*
* @author asmirnov(a)exadel.com
*/
-public class PropertyBase extends ExtensibleBean<PropertyBase.PropertyExtension>
implements MapEntry<String> {
+public class PropertyBase extends ExtensibleBean<PropertyBase.PropertyExtension> {
private String defaultValue;
private String name;
private String suggestedValue;
@@ -54,7 +54,7 @@
*
* @return the name
*/
- public String getKey() {
+ public String getName() {
return name;
}
@@ -63,7 +63,7 @@
*
* @param name the name to set
*/
- public void setKey(String name) {
+ public void setName(String name) {
this.name = name;
}
Modified:
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/PropertyBean.java
===================================================================
---
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/PropertyBean.java 2010-03-07
18:24:15 UTC (rev 16533)
+++
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/PropertyBean.java 2010-03-08
04:03:00 UTC (rev 16534)
@@ -36,7 +36,7 @@
* @author asmirnov(a)exadel.com
*/
@XmlType(name="faces-config-propertyType",namespace=ComponentLibrary.FACES_CONFIG_NAMESPACE,
-
propOrder={"key","type","defaultValue","suggestedValue","extension"})
+
propOrder={"name","type","defaultValue","suggestedValue","extension"})
@XmlJavaTypeAdapter(AttributeAdapter.class)
public class PropertyBean extends PropertyBase {
@@ -46,14 +46,14 @@
* @return the name
*/
@XmlElement(name = "property-name", namespace =
ComponentLibrary.FACES_CONFIG_NAMESPACE)
- public String getKey() {
- return super.getKey();
+ public String getName() {
+ return super.getName();
}
@Override
- public void setKey(String name) {
- super.setKey(name);
+ public void setName(String name) {
+ super.setName(name);
}
/**
* <p class="changed_added_4_0"></p>
Modified:
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/package-info.java
===================================================================
---
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/package-info.java 2010-03-07
18:24:15 UTC (rev 16533)
+++
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/package-info.java 2010-03-08
04:03:00 UTC (rev 16534)
@@ -15,6 +15,8 @@
namespaceURI = ComponentLibrary.FACES_CONFIG_NAMESPACE)})
@XmlJavaTypeAdapters({
@XmlJavaTypeAdapter(type = ClassName.class, value = ClassAdapter.class),
+ @XmlJavaTypeAdapter(type = AttributeModel.class, value = AttributeAdapter.class),
+ @XmlJavaTypeAdapter(type = Property.class, value = PropertyAdapter.class),
@XmlJavaTypeAdapter(type = ComponentLibrary.class, value = FacesConfigAdapter.class)
})
package org.richfaces.cdk.xmlconfig.model;
@@ -26,4 +28,5 @@
import org.richfaces.cdk.model.ClassName;
import org.richfaces.cdk.model.ComponentLibrary;
-
+import org.richfaces.cdk.model.AttributeModel;
+import org.richfaces.cdk.model.Property;