[jbosstools-commits] JBoss Tools SVN: r24063 - in branches/smooks-dmb: plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core and 4 other directories.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Wed Aug 11 13:53:15 EDT 2010
Author: tfennelly
Date: 2010-08-11 13:53:14 -0400 (Wed, 11 Aug 2010)
New Revision: 24063
Modified:
branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/model/smooks-core.ecore
branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/CorePackage.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/GlobalParams.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/IGlobalParams.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/IParams.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/Params.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/dbm/editor/SmooksConfigurationFormPage.java
branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/.project
branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/src/org/jboss/tools/smooks/model/core/ParamsTest.java
Log:
https://jira.jboss.org/browse/JBIDE-6818
Update IParams to allow lookups by type
Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/model/smooks-core.ecore
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/model/smooks-core.ecore 2010-08-11 17:18:13 UTC (rev 24062)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/model/smooks-core.ecore 2010-08-11 17:53:14 UTC (rev 24063)
@@ -1,30 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="core"
- nsURI="http://www.milyn.org/smooks-core/core/1.0.0" nsPrefix="smooks.core">
- <eClassifiers xsi:type="ecore:EClass" name="Param">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Params">
- <eOperations name="getParam" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
- <eParameters name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eOperations>
- <eOperations name="setParam" lowerBound="1" eType="#//Params">
- <eParameters name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eParameters name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eOperations>
- <eStructuralFeatures xsi:type="ecore:EReference" name="params" upperBound="-1"
- eType="#//Param"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="GlobalParams" eSuperTypes="#//Params">
- <eOperations name="setFilterType" eType="#//GlobalParams">
- <eParameters name="filterType" eType="#//StreamFilterType"/>
- </eOperations>
- <eOperations name="getFilterType" eType="#//StreamFilterType"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EDataType" name="StreamFilterType" instanceClassName="org.milyn.StreamFilterType"/>
- <eClassifiers xsi:type="ecore:EClass" name="Component" abstract="true" interface="true"/>
-</ecore:EPackage>
+<?xml version="1.0" encoding="UTF-8"?>
+<ecore:EPackage xmi:version="2.0"
+ xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="core"
+ nsURI="http://www.milyn.org/smooks-core/core/1.0.0" nsPrefix="smooks.core">
+ <eClassifiers xsi:type="ecore:EClass" name="Param">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Params">
+ <eOperations name="setParam" lowerBound="1" eType="#//Params">
+ <eParameters name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eParameters name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eOperations>
+ <eOperations name="setParam" eType="#//Params">
+ <eParameters name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eParameters name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eParameters name="type" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eOperations>
+ <eOperations name="getParam" eType="#//Param">
+ <eParameters name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eOperations>
+ <eOperations name="getParam" eType="#//Param">
+ <eParameters name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eParameters name="type" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eOperations>
+ <eOperations name="getParamValue" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+ <eParameters name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eOperations>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="params" upperBound="-1"
+ eType="#//Param"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="GlobalParams" eSuperTypes="#//Params">
+ <eOperations name="setFilterType" eType="#//GlobalParams">
+ <eParameters name="filterType" eType="#//StreamFilterType"/>
+ </eOperations>
+ <eOperations name="getFilterType" eType="#//StreamFilterType"/>
+ <eOperations name="isDefaultSerializationOn" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+ <eOperations name="setDefaultSerializationOn" eType="#//GlobalParams">
+ <eParameters name="defaultSerializationOn" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+ </eOperations>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EDataType" name="StreamFilterType" instanceClassName="org.milyn.StreamFilterType"/>
+ <eClassifiers xsi:type="ecore:EClass" name="Component" abstract="true" interface="true"/>
+</ecore:EPackage>
Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/CorePackage.java
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/CorePackage.java 2010-08-11 17:18:13 UTC (rev 24062)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/CorePackage.java 2010-08-11 17:53:14 UTC (rev 24063)
@@ -292,13 +292,25 @@
initEClass(paramsEClass, IParams.class, "Params", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEReference(getParams_Params(), this.getParam(), null, "params", null, 0, -1, IParams.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- EOperation op = addEOperation(paramsEClass, ecorePackage.getEString(), "getParam", 0, 1, IS_UNIQUE, IS_ORDERED);
+ EOperation op = addEOperation(paramsEClass, this.getParams(), "setParam", 1, 1, IS_UNIQUE, IS_ORDERED);
addEParameter(op, ecorePackage.getEString(), "name", 1, 1, IS_UNIQUE, IS_ORDERED);
+ addEParameter(op, ecorePackage.getEString(), "value", 0, 1, IS_UNIQUE, IS_ORDERED);
- op = addEOperation(paramsEClass, this.getParams(), "setParam", 1, 1, IS_UNIQUE, IS_ORDERED);
- addEParameter(op, ecorePackage.getEString(), "name", 1, 1, IS_UNIQUE, IS_ORDERED);
+ op = addEOperation(paramsEClass, this.getParams(), "setParam", 0, 1, IS_UNIQUE, IS_ORDERED);
+ addEParameter(op, ecorePackage.getEString(), "name", 0, 1, IS_UNIQUE, IS_ORDERED);
addEParameter(op, ecorePackage.getEString(), "value", 0, 1, IS_UNIQUE, IS_ORDERED);
+ addEParameter(op, ecorePackage.getEString(), "type", 0, 1, IS_UNIQUE, IS_ORDERED);
+ op = addEOperation(paramsEClass, this.getParam(), "getParam", 0, 1, IS_UNIQUE, IS_ORDERED);
+ addEParameter(op, ecorePackage.getEString(), "name", 0, 1, IS_UNIQUE, IS_ORDERED);
+
+ op = addEOperation(paramsEClass, this.getParam(), "getParam", 0, 1, IS_UNIQUE, IS_ORDERED);
+ addEParameter(op, ecorePackage.getEString(), "name", 0, 1, IS_UNIQUE, IS_ORDERED);
+ addEParameter(op, ecorePackage.getEString(), "type", 0, 1, IS_UNIQUE, IS_ORDERED);
+
+ op = addEOperation(paramsEClass, ecorePackage.getEString(), "getParamValue", 0, 1, IS_UNIQUE, IS_ORDERED);
+ addEParameter(op, ecorePackage.getEString(), "name", 1, 1, IS_UNIQUE, IS_ORDERED);
+
initEClass(globalParamsEClass, IGlobalParams.class, "GlobalParams", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
op = addEOperation(globalParamsEClass, this.getGlobalParams(), "setFilterType", 0, 1, IS_UNIQUE, IS_ORDERED);
@@ -306,6 +318,11 @@
addEOperation(globalParamsEClass, this.getStreamFilterType(), "getFilterType", 0, 1, IS_UNIQUE, IS_ORDERED);
+ addEOperation(globalParamsEClass, ecorePackage.getEBoolean(), "isDefaultSerializationOn", 0, 1, IS_UNIQUE, IS_ORDERED);
+
+ op = addEOperation(globalParamsEClass, this.getGlobalParams(), "setDefaultSerializationOn", 0, 1, IS_UNIQUE, IS_ORDERED);
+ addEParameter(op, ecorePackage.getEBoolean(), "defaultSerializationOn", 0, 1, IS_UNIQUE, IS_ORDERED);
+
initEClass(componentEClass, IComponent.class, "Component", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
// Initialize data types
Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/GlobalParams.java
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/GlobalParams.java 2010-08-11 17:18:13 UTC (rev 24062)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/GlobalParams.java 2010-08-11 17:53:14 UTC (rev 24063)
@@ -56,7 +56,7 @@
* @generated NOT
*/
public StreamFilterType getFilterType() {
- String filterType = getParam(Filter.STREAM_FILTER_TYPE);
+ String filterType = getParamValue(Filter.STREAM_FILTER_TYPE);
if(filterType == null) {
return null;
@@ -69,4 +69,33 @@
}
}
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated NOT
+ */
+ public IGlobalParams setDefaultSerializationOn(boolean defaultSerializationOn) {
+ setParam(Filter.DEFAULT_SERIALIZATION_ON, Boolean.toString(defaultSerializationOn));
+ return this;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated NOT
+ */
+ public boolean isDefaultSerializationOn() {
+ String defaultSerializationOn = getParamValue(Filter.DEFAULT_SERIALIZATION_ON);
+
+ if(defaultSerializationOn == null) {
+ return true;
+ }
+
+ try {
+ // On, unless it's explicitly turned off...
+ return !defaultSerializationOn.equals("false");
+ } catch(Exception e) {
+ return true;
+ }
+ }
} //GlobalParams
Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/IGlobalParams.java
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/IGlobalParams.java 2010-08-11 17:18:13 UTC (rev 24062)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/IGlobalParams.java 2010-08-11 17:53:14 UTC (rev 24063)
@@ -35,4 +35,20 @@
*/
StreamFilterType getFilterType();
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @model kind="operation"
+ * @generated
+ */
+ boolean isDefaultSerializationOn();
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @model
+ * @generated
+ */
+ IGlobalParams setDefaultSerializationOn(boolean defaultSerializationOn);
+
} // IGlobalParams
Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/IParams.java
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/IParams.java 2010-08-11 17:18:13 UTC (rev 24062)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/IParams.java 2010-08-11 17:53:14 UTC (rev 24063)
@@ -46,10 +46,26 @@
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ * @model
+ * @generated
+ */
+ IParam getParam(String name);
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @model
+ * @generated
+ */
+ IParam getParam(String name, String type);
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @model nameRequired="true"
* @generated
*/
- String getParam(String name);
+ String getParamValue(String name);
/**
* <!-- begin-user-doc -->
@@ -59,4 +75,12 @@
*/
IParams setParam(String name, String value);
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @model
+ * @generated
+ */
+ IParams setParam(String name, String value, String type);
+
} // IParams
Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/Params.java
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/Params.java 2010-08-11 17:18:13 UTC (rev 24062)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/Params.java 2010-08-11 17:53:14 UTC (rev 24063)
@@ -6,9 +6,6 @@
*/
package org.jboss.tools.smooks.model.core;
-
-
-import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
@@ -81,15 +78,28 @@
* <!-- end-user-doc -->
* @generated NOT
*/
- public String getParam(String name) {
+ public IParam getParam(String name) {
+ return getParam(name, null);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated NOT
+ */
+ public IParam getParam(String name, String type) {
if(params == null) {
return null;
}
for(IParam param : params) {
String paramName = param.getName();
+ String paramType = param.getType();
if(paramName != null && paramName.equals(name)) {
- return param.getValue();
+ if(type != null && !type.equals(paramType)) {
+ continue;
+ }
+ return param;
}
}
@@ -101,7 +111,31 @@
* <!-- end-user-doc -->
* @generated NOT
*/
- public Params setParam(String name, String value) {
+ public String getParamValue(String name) {
+ IParam param = getParam(name);
+
+ if(param == null) {
+ return null;
+ }
+
+ return param.getValue();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated NOT
+ */
+ public IParams setParam(String name, String value) {
+ return setParam(name, value, null);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated NOT
+ */
+ public IParams setParam(String name, String value, String type) {
if(params == null) {
params = new BasicEList<IParam>();
}
@@ -111,6 +145,7 @@
Param newParam = new Param();
newParam.setName(name);
newParam.setValue(value);
+ newParam.setType(type);
params.add(newParam);
return this;
@@ -121,7 +156,7 @@
* <!-- end-user-doc -->
* @generated NOT
*/
- public Params removeParam(String name) {
+ public IParams removeParam(String name) {
if(params == null) {
return this;
}
Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java 2010-08-11 17:18:13 UTC (rev 24062)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java 2010-08-11 17:53:14 UTC (rev 24063)
@@ -136,19 +136,7 @@
SmooksModel rootModel = resourceList.getModelRoot();
GlobalParams params = rootModel.getParams();
if (params != null) {
- EList<IParam> paramList = params.getParams();
-
- for (Iterator<?> iterator = paramList.iterator(); iterator
- .hasNext();) {
- IParam paramType = (IParam) iterator.next();
- String name = paramType.getName();
- String value = paramType.getValue();
- if (inputType.getType().equals(name)
- && inputType.getPath().equals(value)) {
- // find the associated param
- return paramType;
- }
- }
+ return params.getParam(inputType.getType(), inputType.getPath());
}
return null;
}
@@ -156,14 +144,7 @@
public static IParam getInputTypeParam(SmooksModel resourceList) {
GlobalParams params = resourceList.getParams();
if (params != null) {
- List<IParam> paramList = params.getParams();
- for (Iterator<?> iterator = paramList.iterator(); iterator
- .hasNext();) {
- IParam paramType = (IParam) iterator.next();
- if (SmooksModelUtils.INPUT_TYPE.equals(paramType.getName())) {
- return paramType;
- }
- }
+ return params.getParam(SmooksModelUtils.INPUT_TYPE);
}
return null;
}
Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/dbm/editor/SmooksConfigurationFormPage.java
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/dbm/editor/SmooksConfigurationFormPage.java 2010-08-11 17:18:13 UTC (rev 24062)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/dbm/editor/SmooksConfigurationFormPage.java 2010-08-11 17:53:14 UTC (rev 24063)
@@ -38,10 +38,12 @@
import org.jboss.tools.smooks.editor.ISourceSynchronizeListener;
import org.jboss.tools.smooks.graphical.editors.ISmooksEditorInitListener;
import org.jboss.tools.smooks.graphical.editors.SmooksMessage;
+import org.jboss.tools.smooks.model.core.GlobalParams;
import org.jboss.tools.smooks.model.core.ICorePackage;
import org.jboss.tools.smooks.model.core.IParam;
import org.jboss.tools.smooks.model.core.Param;
import org.jboss.tools.smooks.model.core.Params;
+import org.milyn.StreamFilterType;
/**
* @author Dart
@@ -256,7 +258,7 @@
}
- protected Params getParams(){
+ protected GlobalParams getParams(){
if(smooksModelProvider != null){
return smooksModelProvider.getSmooksModel().getModelRoot().getParams();
}
@@ -264,21 +266,18 @@
}
protected void initGlobalSettingControls() {
- Params m = getParams();
- if (m != null) {
- EList<IParam> parmList = m.getParams();
- for (int i = 0; i < parmList.size(); i++) {
- Param param = (Param) parmList.get(i);
- if (param.getName().equals("stream.filter.type")) { //$NON-NLS-1$
- streamFilterTypeCombo.setText(param.getValue());
- } else if (param.getName().equals("default.serialization.on")) { //$NON-NLS-1$
- Boolean boolValue = Boolean.valueOf(param.getValue());
- defaultSerializationOnCheckbox.setSelection(boolValue.booleanValue());
- }
+ // Set defaults first...
+ streamFilterTypeCombo.setText(StreamFilterType.SAX.name());
+ defaultSerializationOnCheckbox.setSelection(true);
+
+ GlobalParams globalParams = getParams();
+ if (globalParams != null) {
+ StreamFilterType filterType = globalParams.getFilterType();
+
+ if(filterType != null) {
+ streamFilterTypeCombo.setText(filterType.name());
}
- } else { // set defaults
- streamFilterTypeCombo.setText("SAX"); //$NON-NLS-1$
- defaultSerializationOnCheckbox.setSelection(true);
+ defaultSerializationOnCheckbox.setSelection(globalParams.isDefaultSerializationOn());
}
}
Modified: branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/.project
===================================================================
--- branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/.project 2010-08-11 17:18:13 UTC (rev 24062)
+++ branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/.project 2010-08-11 17:53:14 UTC (rev 24063)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.jboss.tools.smooks.core.test</name>
+ <name>org.jboss.tools.smooks.core.model.test</name>
<comment></comment>
<projects>
</projects>
Modified: branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/src/org/jboss/tools/smooks/model/core/ParamsTest.java
===================================================================
--- branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/src/org/jboss/tools/smooks/model/core/ParamsTest.java 2010-08-11 17:18:13 UTC (rev 24062)
+++ branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/src/org/jboss/tools/smooks/model/core/ParamsTest.java 2010-08-11 17:53:14 UTC (rev 24063)
@@ -39,9 +39,9 @@
assertEquals(null, params.getParam("a"));
params.removeParam("a"); // make sure there's no exception
params.setParam("a", "aVal");
- assertEquals("aVal", params.getParam("a"));
+ assertEquals("aVal", params.getParamValue("a"));
params.setParam("a", "bVal");
- assertEquals("bVal", params.getParam("a"));
+ assertEquals("bVal", params.getParamValue("a"));
params.setFilterType(StreamFilterType.SAX);
assertTrue(params.getFilterType() == StreamFilterType.SAX);
params.setFilterType(StreamFilterType.DOM);
More information about the jbosstools-commits
mailing list