Author: DartPeng
Date: 2009-11-09 03:26:50 -0500 (Mon, 09 Nov 2009)
New Revision: 18490
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/calc/impl/CalcPackageImpl.java
trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/javabean/impl/JavabeanPackageImpl.java
trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/javabean12/impl/Javabean12PackageImpl.java
trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/smooks/impl/SmooksPackageImpl.java
trunk/smooks/tests/org.jboss.tools.smooks.core.test/src/org/jboss/tools/smooks/test/openeditor/OpenAllSmooksConfigFileTestCase.java
Log:
JBIDE-5157
Change the metadata of smooks-resource-config element
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/calc/impl/CalcPackageImpl.java
===================================================================
---
trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/calc/impl/CalcPackageImpl.java 2009-11-09
06:41:28 UTC (rev 18489)
+++
trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/calc/impl/CalcPackageImpl.java 2009-11-09
08:26:50 UTC (rev 18490)
@@ -455,7 +455,7 @@
source,
new String[] {
"name", "counter",
- "kind", "elementOnly"
+ "kind", "mixed"
});
addAnnotation
(getCounter_StartExpression(),
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/javabean/impl/JavabeanPackageImpl.java
===================================================================
---
trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/javabean/impl/JavabeanPackageImpl.java 2009-11-09
06:41:28 UTC (rev 18489)
+++
trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/javabean/impl/JavabeanPackageImpl.java 2009-11-09
08:26:50 UTC (rev 18490)
@@ -724,7 +724,7 @@
source,
new String[] {
"name", "bindings_._type",
- "kind", "elementOnly"
+ "kind", "mixed"
});
addAnnotation
(getBindingsType_Group(),
@@ -932,7 +932,7 @@
source,
new String[] {
"name", "value_._type",
- "kind", "elementOnly"
+ "kind", "mixed"
});
addAnnotation
(getValueType_DecodeParam(),
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/javabean12/impl/Javabean12PackageImpl.java
===================================================================
---
trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/javabean12/impl/Javabean12PackageImpl.java 2009-11-09
06:41:28 UTC (rev 18489)
+++
trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/javabean12/impl/Javabean12PackageImpl.java 2009-11-09
08:26:50 UTC (rev 18490)
@@ -768,7 +768,7 @@
source,
new String[] {
"name", "bean_._type",
- "kind", "elementOnly"
+ "kind", "mixed"
});
addAnnotation
(getBeanType_Group(),
@@ -992,7 +992,7 @@
source,
new String[] {
"name", "result_._type",
- "kind", "elementOnly"
+ "kind", "mixed"
});
addAnnotation
(getResultType_RetainBeans(),
@@ -1006,7 +1006,7 @@
source,
new String[] {
"name", "value_._type",
- "kind", "elementOnly"
+ "kind", "mixed"
});
addAnnotation
(getValueType_DecodeParam(),
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/smooks/impl/SmooksPackageImpl.java
===================================================================
---
trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/smooks/impl/SmooksPackageImpl.java 2009-11-09
06:41:28 UTC (rev 18489)
+++
trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/smooks/impl/SmooksPackageImpl.java 2009-11-09
08:26:50 UTC (rev 18490)
@@ -1950,7 +1950,7 @@
source,
new String[] {
"name", "smooks-resource-list_._type",
- "kind", "elementOnly"
+ "kind", "mixed"
});
addAnnotation
(getSmooksResourceListType_Params(),
Modified:
trunk/smooks/tests/org.jboss.tools.smooks.core.test/src/org/jboss/tools/smooks/test/openeditor/OpenAllSmooksConfigFileTestCase.java
===================================================================
---
trunk/smooks/tests/org.jboss.tools.smooks.core.test/src/org/jboss/tools/smooks/test/openeditor/OpenAllSmooksConfigFileTestCase.java 2009-11-09
06:41:28 UTC (rev 18489)
+++
trunk/smooks/tests/org.jboss.tools.smooks.core.test/src/org/jboss/tools/smooks/test/openeditor/OpenAllSmooksConfigFileTestCase.java 2009-11-09
08:26:50 UTC (rev 18490)
@@ -91,8 +91,8 @@
IEditorPart part = IDE.openEditor(window.getActivePage(), cf);
Assert.assertNotNull(part);
Assert.assertTrue(
- "Editor isn't Smooks editor , there are some errors occur when create
Smooks Editor",
- (part instanceof AbstractSmooksFormEditor));
+ "Editor isn't Smooks editor , there are some errors occur when create
Smooks Editor for file : '"
+ + cf.getName() + "'", (part instanceof
AbstractSmooksFormEditor));
System.out.println("successful to open file : '" + cf.getName() +
"'");
}
}