[jbosstools-commits] JBoss Tools SVN: r22582 - in workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model: core and 1 other directories.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Sat Jun 5 05:16:12 EDT 2010
Author: tfennelly
Date: 2010-06-05 05:16:11 -0400 (Sat, 05 Jun 2010)
New Revision: 22582
Added:
workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/Component.java
Modified:
workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/SmooksModel.java
workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/v1.1.ftl
workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/v1.1.xml
workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/Bean.java
Log:
some work on the generalized types in the model
Modified: workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/SmooksModel.java
===================================================================
--- workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/SmooksModel.java 2010-06-05 08:50:31 UTC (rev 22581)
+++ workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/SmooksModel.java 2010-06-05 09:16:11 UTC (rev 22582)
@@ -19,8 +19,8 @@
*/
package org.jboss.tools.smooks.model;
+import org.jboss.tools.smooks.model.core.Component;
import org.jboss.tools.smooks.model.core.Reader;
-import org.jboss.tools.smooks.model.javabean.Bean;
import org.milyn.javabean.dynamic.serialize.DefaultNamespace;
import java.util.ArrayList;
@@ -37,7 +37,7 @@
public static final String MODEL_DESCRIPTOR = "org/jboss/tools/smooks/model/descriptor.properties";
private List<Reader> readers = new ArrayList<Reader>();
- private List<Bean> beans = new ArrayList<Bean>();
+ private List<Component> components = new ArrayList<Component>();
public List<Reader> getReaders() {
return readers;
@@ -47,11 +47,11 @@
this.readers = readers;
}
- public List<Bean> getBeans() {
- return beans;
- }
+ public List<Component> getComponents() {
+ return components;
+ }
- public void setBeans(List<Bean> beans) {
- this.beans = beans;
- }
+ public void setComponents(List<Component> components) {
+ this.components = components;
+ }
}
Added: workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/Component.java
===================================================================
--- workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/Component.java (rev 0)
+++ workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/Component.java 2010-06-05 09:16:11 UTC (rev 22582)
@@ -0,0 +1,30 @@
+/**
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * 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,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2009, JBoss Inc.
+ */
+package org.jboss.tools.smooks.model.core;
+
+import org.jboss.tools.smooks.model.javabean.Bean;
+
+/**
+ * Marker interface for Smooks non-reader components, such as {@link Bean Beans} etc.
+ *
+ * @author <a href="mailto:tom.fennelly at gmail.com">tom.fennelly at gmail.com</a>
+ */
+public interface Component {
+}
\ No newline at end of file
Property changes on: workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/Component.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/v1.1.ftl
===================================================================
--- workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/v1.1.ftl 2010-06-05 08:50:31 UTC (rev 22581)
+++ workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/v1.1.ftl 2010-06-05 09:16:11 UTC (rev 22582)
@@ -2,6 +2,6 @@
<smooks-resource-list <@writeNamespaces indent="22"/>>
<#list bean.readers as reader><@writeBean bean=reader /></#list>
-<#list bean.beans as bean><@writeBean bean=bean /></#list>
+<#list bean.components as component><@writeBean bean=component /></#list>
</smooks-resource-list>
\ No newline at end of file
Modified: workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/v1.1.xml
===================================================================
--- workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/v1.1.xml 2010-06-05 08:50:31 UTC (rev 22581)
+++ workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/v1.1.xml 2010-06-05 09:16:11 UTC (rev 22582)
@@ -6,15 +6,15 @@
<!--
Main Smooks model bean.
-->
- <jb:bean beanId="smooksModel" class="org.jboss.tools.smooks.model.core.SmooksModel" createOnElement="#document">
+ <jb:bean beanId="smooksModel" class="org.jboss.tools.smooks.model.SmooksModel" createOnElement="#document">
<jb:wiring property="readers" beanIdRef="readers" />
- <jb:wiring property="beans" beanIdRef="beans" />
+ <jb:wiring property="components" beanIdRef="components" />
</jb:bean>
<jb:bean beanId="readers" class="java.util.ArrayList" createOnElement="#document">
<jb:wiring beanType="org.jboss.tools.smooks.model.core.Reader" />
</jb:bean>
- <jb:bean beanId="beans" class="java.util.ArrayList" createOnElement="#document">
- <jb:wiring beanType="org.jboss.tools.smooks.model.javabean.Bean" />
+ <jb:bean beanId="components" class="java.util.ArrayList" createOnElement="#document">
+ <jb:wiring beanType="org.jboss.tools.smooks.model.core.Component" />
</jb:bean>
<!--
Modified: workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/Bean.java
===================================================================
--- workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/Bean.java 2010-06-05 08:50:31 UTC (rev 22581)
+++ workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/Bean.java 2010-06-05 09:16:11 UTC (rev 22582)
@@ -19,6 +19,7 @@
*/
package org.jboss.tools.smooks.model.javabean;
+import org.jboss.tools.smooks.model.core.Component;
import org.milyn.javabean.dynamic.serialize.DefaultNamespace;
import java.util.List;
@@ -31,7 +32,7 @@
* @author <a href="mailto:tom.fennelly at gmail.com">tom.fennelly at gmail.com</a>
*/
@DefaultNamespace(uri = "http://www.milyn.org/xsd/smooks/javabean-1.3.xsd", prefix = "jb13")
-public class Bean {
+public class Bean implements Component {
private String beanId;
private String beanClass;
More information about the jbosstools-commits
mailing list