JBoss Tools SVN: r24467 - trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/newfile.
by jbosstools-commits@lists.jboss.org
Author: mareshkau
Date: 2010-08-26 08:06:30 -0400 (Thu, 26 Aug 2010)
New Revision: 24467
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/newfile/NewXHTMLTemplatesWizardPage.java
Log:
https://jira.jboss.org/browse/JBIDE-6921
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/newfile/NewXHTMLTemplatesWizardPage.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/newfile/NewXHTMLTemplatesWizardPage.java 2010-08-26 10:50:37 UTC (rev 24466)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/newfile/NewXHTMLTemplatesWizardPage.java 2010-08-26 12:06:30 UTC (rev 24467)
@@ -378,6 +378,7 @@
fLastSelectedTemplateName = ""; //$NON-NLS-1$
fTableViewer.setSelection(null);
+ updateViewerInput();
}
else {
setSelectedTemplate(fLastSelectedTemplateName);
@@ -509,8 +510,8 @@
Template template = getSelectedTemplate();
if (template != null) {
pattern = template.getPattern();
- fJspFileSupport.setTaglibsFromTemplateBody(pattern);
}
+ fJspFileSupport.setTaglibsFromTemplateBody(pattern);
fPatternViewer.getDocument().set(pattern);
}
}
15 years, 4 months
JBoss Tools SVN: r24466 - branches/jbosstools-3.2.0.M2/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions.
by jbosstools-commits@lists.jboss.org
Author: dgeraskov
Date: 2010-08-26 06:50:37 -0400 (Thu, 26 Aug 2010)
New Revision: 24466
Modified:
branches/jbosstools-3.2.0.M2/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/DeleteConfigurationAction.java
Log:
https://jira.jboss.org/browse/JBIDE-6910
fix ClassCastException
Modified: branches/jbosstools-3.2.0.M2/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/DeleteConfigurationAction.java
===================================================================
--- branches/jbosstools-3.2.0.M2/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/DeleteConfigurationAction.java 2010-08-26 10:18:51 UTC (rev 24465)
+++ branches/jbosstools-3.2.0.M2/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/DeleteConfigurationAction.java 2010-08-26 10:50:37 UTC (rev 24466)
@@ -51,6 +51,17 @@
public void run() {
List selectedNonResources = getSelectedNonResources();
+ boolean ccSelected = false;
+ Iterator iter = selectedNonResources.iterator();
+ while (iter.hasNext() ) {
+ if (iter.next() instanceof ConsoleConfiguration) {
+ ccSelected = true;
+ break;
+ }
+ }
+
+ if (!ccSelected) return;
+
String question = HibernateConsoleMessages.DeleteConfigurationAction_do_you_wish_del_selected_config;
String title = HibernateConsoleMessages.DeleteConfigurationAction_delete_console_config;
if (selectedNonResources.size() > 1){
@@ -60,10 +71,13 @@
question += HibernateConsoleMessages.DeleteConfigurationAction_str_3;
if( MessageDialog.openConfirm( null, title, question)) {
- Iterator iter = selectedNonResources.iterator();
+ iter = selectedNonResources.iterator();
while (iter.hasNext() ) {
- ConsoleConfiguration element = (ConsoleConfiguration) iter.next();
- KnownConfigurations.getInstance().removeConfiguration(element, false);
+ Object selElement = iter.next();
+ if (selElement instanceof ConsoleConfiguration) {
+ ConsoleConfiguration element = (ConsoleConfiguration) selElement;
+ KnownConfigurations.getInstance().removeConfiguration(element, false);
+ }
}
part.refresh();
15 years, 4 months
JBoss Tools SVN: r24465 - branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model.
by jbosstools-commits@lists.jboss.org
Author: DartPeng
Date: 2010-08-26 06:18:51 -0400 (Thu, 26 Aug 2010)
New Revision: 24465
Removed:
branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/Test.java
Log:
Deleted: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/Test.java
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/Test.java 2010-08-26 10:17:40 UTC (rev 24464)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/Test.java 2010-08-26 10:18:51 UTC (rev 24465)
@@ -1,33 +0,0 @@
-package org.jboss.tools.smooks.model;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.util.EContentAdapter;
-import org.jboss.tools.smooks.model.core.ICoreFactory;
-import org.jboss.tools.smooks.model.core.IGlobalParams;
-import org.jboss.tools.smooks.model.core.IParam;
-
-
-public class Test {
-
- /**
- * @param args
- */
- public static void main(String[] args) {
- IGlobalParams params = ICoreFactory.eINSTANCE.createGlobalParams();
- params.eAdapters().add(new EContentAdapter(){
-
- @Override
- public void notifyChanged(Notification notification) {
- System.out.println("change");
- super.notifyChanged(notification);
- }
-
-
-
- });
- IParam pp = ICoreFactory.eINSTANCE.createParam();
- params.getParams().add(pp);
- pp.setName("name");
- }
-
-}
15 years, 4 months
JBoss Tools SVN: r24464 - in trunk: tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2010-08-26 06:17:40 -0400 (Thu, 26 Aug 2010)
New Revision: 24464
Modified:
trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/src/org/jboss/tools/ui/bot/test/JBTSWTBotTestCase.java
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTTestExt.java
Log:
Fixes for JBT 3.2.0.M2
Modified: trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/src/org/jboss/tools/ui/bot/test/JBTSWTBotTestCase.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/src/org/jboss/tools/ui/bot/test/JBTSWTBotTestCase.java 2010-08-26 10:13:56 UTC (rev 24463)
+++ trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/src/org/jboss/tools/ui/bot/test/JBTSWTBotTestCase.java 2010-08-26 10:17:40 UTC (rev 24464)
@@ -133,8 +133,7 @@
@Override
protected void setUp() throws Exception {
- // close Report Usage Window
- jbt.closeReportUsageWindowIfOpened(false);
+ super.setUp();
activePerspective();
try {
bot.viewByTitle(WidgetVariables.WELCOME).close();
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTTestExt.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTTestExt.java 2010-08-26 10:13:56 UTC (rev 24463)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTTestExt.java 2010-08-26 10:17:40 UTC (rev 24464)
@@ -66,5 +66,8 @@
public static int TIME_10S = Timing.time10S();
public static int TIME_20S = Timing.time20S();
-
+ protected void setUp() throws Exception {
+ // close Report Usage Window
+ jbt.closeReportUsageWindowIfOpened(false);
+ }
}
15 years, 4 months
JBoss Tools SVN: r24463 - in branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model: src/org/jboss/tools/smooks/model/core and 1 other directories.
by jbosstools-commits@lists.jboss.org
Author: DartPeng
Date: 2010-08-26 06:13:56 -0400 (Thu, 26 Aug 2010)
New Revision: 24463
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-javabean.ecore
branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/model/smooks.genmodel
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/ICorePackage.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.ecore.model/src/org/jboss/tools/smooks/model/javabean/Bean.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/javabean/IBean.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/javabean/IJavaBeanPackage.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/javabean/JavaBeanPackage.java
Log:
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-26 09:50:35 UTC (rev 24462)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/model/smooks-core.ecore 2010-08-26 10:13:56 UTC (rev 24463)
@@ -1,46 +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="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>
+<?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" containment="true"/>
+ </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/model/smooks-javabean.ecore
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/model/smooks-javabean.ecore 2010-08-26 09:50:35 UTC (rev 24462)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/model/smooks-javabean.ecore 2010-08-26 10:13:56 UTC (rev 24463)
@@ -51,10 +51,10 @@
<eStructuralFeatures xsi:type="ecore:EAttribute" name="createOnElement" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="createOnElementNS" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="valueBindings" upperBound="-1"
- eType="#//Value"/>
+ eType="#//Value" containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="wireBindings" upperBound="-1"
- eType="#//Wiring"/>
+ eType="#//Wiring" containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="expressionBindings" upperBound="-1"
- eType="#//Expression"/>
+ eType="#//Expression" containment="true"/>
</eClassifiers>
</ecore:EPackage>
Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/model/smooks.genmodel
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/model/smooks.genmodel 2010-08-26 09:50:35 UTC (rev 24462)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/model/smooks.genmodel 2010-08-26 10:13:56 UTC (rev 24463)
@@ -19,19 +19,35 @@
</genClasses>
<genClasses ecoreClass="smooks-core.ecore#//Params">
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference smooks-core.ecore#//Params/params"/>
- <genOperations ecoreOperation="smooks-core.ecore#//Params/getParam">
- <genParameters ecoreParameter="smooks-core.ecore#//Params/getParam/name"/>
- </genOperations>
<genOperations ecoreOperation="smooks-core.ecore#//Params/setParam">
<genParameters ecoreParameter="smooks-core.ecore#//Params/setParam/name"/>
<genParameters ecoreParameter="smooks-core.ecore#//Params/setParam/value"/>
</genOperations>
+ <genOperations ecoreOperation="smooks-core.ecore#//Params/setParam.1">
+ <genParameters ecoreParameter="smooks-core.ecore#//Params/setParam.1/name"/>
+ <genParameters ecoreParameter="smooks-core.ecore#//Params/setParam.1/value"/>
+ <genParameters ecoreParameter="smooks-core.ecore#//Params/setParam.1/type"/>
+ </genOperations>
+ <genOperations ecoreOperation="smooks-core.ecore#//Params/getParam">
+ <genParameters ecoreParameter="smooks-core.ecore#//Params/getParam/name"/>
+ </genOperations>
+ <genOperations ecoreOperation="smooks-core.ecore#//Params/getParam.1">
+ <genParameters ecoreParameter="smooks-core.ecore#//Params/getParam.1/name"/>
+ <genParameters ecoreParameter="smooks-core.ecore#//Params/getParam.1/type"/>
+ </genOperations>
+ <genOperations ecoreOperation="smooks-core.ecore#//Params/getParamValue">
+ <genParameters ecoreParameter="smooks-core.ecore#//Params/getParamValue/name"/>
+ </genOperations>
</genClasses>
<genClasses ecoreClass="smooks-core.ecore#//GlobalParams">
<genOperations ecoreOperation="smooks-core.ecore#//GlobalParams/setFilterType">
<genParameters ecoreParameter="smooks-core.ecore#//GlobalParams/setFilterType/filterType"/>
</genOperations>
<genOperations ecoreOperation="smooks-core.ecore#//GlobalParams/getFilterType"/>
+ <genOperations ecoreOperation="smooks-core.ecore#//GlobalParams/isDefaultSerializationOn"/>
+ <genOperations ecoreOperation="smooks-core.ecore#//GlobalParams/setDefaultSerializationOn">
+ <genParameters ecoreParameter="smooks-core.ecore#//GlobalParams/setDefaultSerializationOn/defaultSerializationOn"/>
+ </genOperations>
</genClasses>
<genClasses image="false" ecoreClass="smooks-core.ecore#//Component"/>
</genPackages>
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-26 09:50:35 UTC (rev 24462)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/CorePackage.java 2010-08-26 10:13:56 UTC (rev 24463)
@@ -290,7 +290,7 @@
initEAttribute(getParam_Type(), ecorePackage.getEString(), "type", null, 0, 1, IParam.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
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);
+ 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, this.getParams(), "setParam", 1, 1, IS_UNIQUE, IS_ORDERED);
addEParameter(op, ecorePackage.getEString(), "name", 1, 1, IS_UNIQUE, IS_ORDERED);
Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/ICorePackage.java
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/ICorePackage.java 2010-08-26 09:50:35 UTC (rev 24462)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/ICorePackage.java 2010-08-26 10:13:56 UTC (rev 24463)
@@ -117,7 +117,7 @@
int PARAMS = 1;
/**
- * The feature id for the '<em><b>Params</b></em>' reference list.
+ * The feature id for the '<em><b>Params</b></em>' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -145,7 +145,7 @@
int GLOBAL_PARAMS = 2;
/**
- * The feature id for the '<em><b>Params</b></em>' reference list.
+ * The feature id for the '<em><b>Params</b></em>' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -246,10 +246,10 @@
EClass getParams();
/**
- * Returns the meta object for the reference list '{@link org.jboss.tools.smooks.model.core.IParams#getParams <em>Params</em>}'.
+ * Returns the meta object for the containment reference list '{@link org.jboss.tools.smooks.model.core.IParams#getParams <em>Params</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for the reference list '<em>Params</em>'.
+ * @return the meta object for the containment reference list '<em>Params</em>'.
* @see org.jboss.tools.smooks.model.core.IParams#getParams()
* @see #getParams()
* @generated
@@ -354,7 +354,7 @@
EClass PARAMS = eINSTANCE.getParams();
/**
- * The meta object literal for the '<em><b>Params</b></em>' reference list feature.
+ * The meta object literal for the '<em><b>Params</b></em>' containment reference list feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
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-26 09:50:35 UTC (rev 24462)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/IParams.java 2010-08-26 10:13:56 UTC (rev 24463)
@@ -28,7 +28,7 @@
*/
public interface IParams extends EObject {
/**
- * Returns the value of the '<em><b>Params</b></em>' reference list.
+ * Returns the value of the '<em><b>Params</b></em>' containment reference list.
* The list contents are of type {@link org.jboss.tools.smooks.model.core.IParam}.
* <!-- begin-user-doc -->
* <p>
@@ -36,9 +36,9 @@
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
- * @return the value of the '<em>Params</em>' reference list.
+ * @return the value of the '<em>Params</em>' containment reference list.
* @see org.jboss.tools.smooks.model.core.ICorePackage#getParams_Params()
- * @model
+ * @model containment="true"
* @generated
*/
EList<IParam> getParams();
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-26 09:50:35 UTC (rev 24462)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/Params.java 2010-08-26 10:13:56 UTC (rev 24463)
@@ -7,6 +7,7 @@
package org.jboss.tools.smooks.model.core;
import java.util.Collection;
+import org.eclipse.emf.common.notify.NotificationChain;
import java.util.Iterator;
import org.eclipse.emf.common.util.BasicEList;
@@ -14,8 +15,11 @@
import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
import org.eclipse.emf.ecore.impl.EObjectImpl;
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
import org.eclipse.emf.ecore.util.EObjectResolvingEList;
/**
@@ -33,7 +37,7 @@
*/
public class Params extends EObjectImpl implements IParams {
/**
- * The cached value of the '{@link #getParams() <em>Params</em>}' reference list.
+ * The cached value of the '{@link #getParams() <em>Params</em>}' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see #getParams()
@@ -68,7 +72,7 @@
*/
public EList<IParam> getParams() {
if (params == null) {
- params = new EObjectResolvingEList<IParam>(IParam.class, this, ICorePackage.PARAMS__PARAMS);
+ params = new EObjectContainmentEList<IParam>(IParam.class, this, ICorePackage.PARAMS__PARAMS);
}
return params;
}
@@ -124,6 +128,20 @@
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+ switch (featureID) {
+ case ICorePackage.PARAMS__PARAMS:
+ return ((InternalEList<?>)getParams()).basicRemove(otherEnd, msgs);
+ }
+ return super.eInverseRemove(otherEnd, featureID, msgs);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated NOT
*/
public IParams setParam(String name, String value) {
Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/javabean/Bean.java
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/javabean/Bean.java 2010-08-26 09:50:35 UTC (rev 24462)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/javabean/Bean.java 2010-08-26 10:13:56 UTC (rev 24463)
@@ -10,13 +10,17 @@
import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.EObjectImpl;
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
import org.eclipse.emf.ecore.util.EObjectResolvingEList;
/**
@@ -120,7 +124,7 @@
protected String createOnElementNS = CREATE_ON_ELEMENT_NS_EDEFAULT;
/**
- * The cached value of the '{@link #getValueBindings() <em>Value Bindings</em>}' reference list.
+ * The cached value of the '{@link #getValueBindings() <em>Value Bindings</em>}' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see #getValueBindings()
@@ -130,7 +134,7 @@
protected EList<IValue> valueBindings;
/**
- * The cached value of the '{@link #getWireBindings() <em>Wire Bindings</em>}' reference list.
+ * The cached value of the '{@link #getWireBindings() <em>Wire Bindings</em>}' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see #getWireBindings()
@@ -140,7 +144,7 @@
protected EList<IWiring> wireBindings;
/**
- * The cached value of the '{@link #getExpressionBindings() <em>Expression Bindings</em>}' reference list.
+ * The cached value of the '{@link #getExpressionBindings() <em>Expression Bindings</em>}' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see #getExpressionBindings()
@@ -259,7 +263,7 @@
*/
public EList<IValue> getValueBindings() {
if (valueBindings == null) {
- valueBindings = new EObjectResolvingEList<IValue>(IValue.class, this, IJavaBeanPackage.BEAN__VALUE_BINDINGS);
+ valueBindings = new EObjectContainmentEList<IValue>(IValue.class, this, IJavaBeanPackage.BEAN__VALUE_BINDINGS);
}
return valueBindings;
}
@@ -271,7 +275,7 @@
*/
public EList<IWiring> getWireBindings() {
if (wireBindings == null) {
- wireBindings = new EObjectResolvingEList<IWiring>(IWiring.class, this, IJavaBeanPackage.BEAN__WIRE_BINDINGS);
+ wireBindings = new EObjectContainmentEList<IWiring>(IWiring.class, this, IJavaBeanPackage.BEAN__WIRE_BINDINGS);
}
return wireBindings;
}
@@ -283,7 +287,7 @@
*/
public EList<IExpression> getExpressionBindings() {
if (expressionBindings == null) {
- expressionBindings = new EObjectResolvingEList<IExpression>(IExpression.class, this, IJavaBeanPackage.BEAN__EXPRESSION_BINDINGS);
+ expressionBindings = new EObjectContainmentEList<IExpression>(IExpression.class, this, IJavaBeanPackage.BEAN__EXPRESSION_BINDINGS);
}
return expressionBindings;
}
@@ -294,6 +298,24 @@
* @generated
*/
@Override
+ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+ switch (featureID) {
+ case IJavaBeanPackage.BEAN__VALUE_BINDINGS:
+ return ((InternalEList<?>)getValueBindings()).basicRemove(otherEnd, msgs);
+ case IJavaBeanPackage.BEAN__WIRE_BINDINGS:
+ return ((InternalEList<?>)getWireBindings()).basicRemove(otherEnd, msgs);
+ case IJavaBeanPackage.BEAN__EXPRESSION_BINDINGS:
+ return ((InternalEList<?>)getExpressionBindings()).basicRemove(otherEnd, msgs);
+ }
+ return super.eInverseRemove(otherEnd, featureID, msgs);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
switch (featureID) {
case IJavaBeanPackage.BEAN__BEAN_ID:
Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/javabean/IBean.java
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/javabean/IBean.java 2010-08-26 09:50:35 UTC (rev 24462)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/javabean/IBean.java 2010-08-26 10:13:56 UTC (rev 24463)
@@ -138,7 +138,7 @@
void setCreateOnElementNS(String value);
/**
- * Returns the value of the '<em><b>Value Bindings</b></em>' reference list.
+ * Returns the value of the '<em><b>Value Bindings</b></em>' containment reference list.
* The list contents are of type {@link org.jboss.tools.smooks.model.javabean.IValue}.
* <!-- begin-user-doc -->
* <p>
@@ -146,15 +146,15 @@
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
- * @return the value of the '<em>Value Bindings</em>' reference list.
+ * @return the value of the '<em>Value Bindings</em>' containment reference list.
* @see org.jboss.tools.smooks.model.javabean.IJavaBeanPackage#getBean_ValueBindings()
- * @model
+ * @model containment="true"
* @generated
*/
EList<IValue> getValueBindings();
/**
- * Returns the value of the '<em><b>Wire Bindings</b></em>' reference list.
+ * Returns the value of the '<em><b>Wire Bindings</b></em>' containment reference list.
* The list contents are of type {@link org.jboss.tools.smooks.model.javabean.IWiring}.
* <!-- begin-user-doc -->
* <p>
@@ -162,15 +162,15 @@
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
- * @return the value of the '<em>Wire Bindings</em>' reference list.
+ * @return the value of the '<em>Wire Bindings</em>' containment reference list.
* @see org.jboss.tools.smooks.model.javabean.IJavaBeanPackage#getBean_WireBindings()
- * @model
+ * @model containment="true"
* @generated
*/
EList<IWiring> getWireBindings();
/**
- * Returns the value of the '<em><b>Expression Bindings</b></em>' reference list.
+ * Returns the value of the '<em><b>Expression Bindings</b></em>' containment reference list.
* The list contents are of type {@link org.jboss.tools.smooks.model.javabean.IExpression}.
* <!-- begin-user-doc -->
* <p>
@@ -178,9 +178,9 @@
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
- * @return the value of the '<em>Expression Bindings</em>' reference list.
+ * @return the value of the '<em>Expression Bindings</em>' containment reference list.
* @see org.jboss.tools.smooks.model.javabean.IJavaBeanPackage#getBean_ExpressionBindings()
- * @model
+ * @model containment="true"
* @generated
*/
EList<IExpression> getExpressionBindings();
Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/javabean/IJavaBeanPackage.java
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/javabean/IJavaBeanPackage.java 2010-08-26 09:50:35 UTC (rev 24462)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/javabean/IJavaBeanPackage.java 2010-08-26 10:13:56 UTC (rev 24463)
@@ -355,7 +355,7 @@
int BEAN__CREATE_ON_ELEMENT_NS = ICorePackage.COMPONENT_FEATURE_COUNT + 3;
/**
- * The feature id for the '<em><b>Value Bindings</b></em>' reference list.
+ * The feature id for the '<em><b>Value Bindings</b></em>' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -364,7 +364,7 @@
int BEAN__VALUE_BINDINGS = ICorePackage.COMPONENT_FEATURE_COUNT + 4;
/**
- * The feature id for the '<em><b>Wire Bindings</b></em>' reference list.
+ * The feature id for the '<em><b>Wire Bindings</b></em>' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -373,7 +373,7 @@
int BEAN__WIRE_BINDINGS = ICorePackage.COMPONENT_FEATURE_COUNT + 5;
/**
- * The feature id for the '<em><b>Expression Bindings</b></em>' reference list.
+ * The feature id for the '<em><b>Expression Bindings</b></em>' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -695,10 +695,10 @@
EAttribute getBean_CreateOnElementNS();
/**
- * Returns the meta object for the reference list '{@link org.jboss.tools.smooks.model.javabean.IBean#getValueBindings <em>Value Bindings</em>}'.
+ * Returns the meta object for the containment reference list '{@link org.jboss.tools.smooks.model.javabean.IBean#getValueBindings <em>Value Bindings</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for the reference list '<em>Value Bindings</em>'.
+ * @return the meta object for the containment reference list '<em>Value Bindings</em>'.
* @see org.jboss.tools.smooks.model.javabean.IBean#getValueBindings()
* @see #getBean()
* @generated
@@ -706,10 +706,10 @@
EReference getBean_ValueBindings();
/**
- * Returns the meta object for the reference list '{@link org.jboss.tools.smooks.model.javabean.IBean#getWireBindings <em>Wire Bindings</em>}'.
+ * Returns the meta object for the containment reference list '{@link org.jboss.tools.smooks.model.javabean.IBean#getWireBindings <em>Wire Bindings</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for the reference list '<em>Wire Bindings</em>'.
+ * @return the meta object for the containment reference list '<em>Wire Bindings</em>'.
* @see org.jboss.tools.smooks.model.javabean.IBean#getWireBindings()
* @see #getBean()
* @generated
@@ -717,10 +717,10 @@
EReference getBean_WireBindings();
/**
- * Returns the meta object for the reference list '{@link org.jboss.tools.smooks.model.javabean.IBean#getExpressionBindings <em>Expression Bindings</em>}'.
+ * Returns the meta object for the containment reference list '{@link org.jboss.tools.smooks.model.javabean.IBean#getExpressionBindings <em>Expression Bindings</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for the reference list '<em>Expression Bindings</em>'.
+ * @return the meta object for the containment reference list '<em>Expression Bindings</em>'.
* @see org.jboss.tools.smooks.model.javabean.IBean#getExpressionBindings()
* @see #getBean()
* @generated
@@ -984,7 +984,7 @@
EAttribute BEAN__CREATE_ON_ELEMENT_NS = eINSTANCE.getBean_CreateOnElementNS();
/**
- * The meta object literal for the '<em><b>Value Bindings</b></em>' reference list feature.
+ * The meta object literal for the '<em><b>Value Bindings</b></em>' containment reference list feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -992,7 +992,7 @@
EReference BEAN__VALUE_BINDINGS = eINSTANCE.getBean_ValueBindings();
/**
- * The meta object literal for the '<em><b>Wire Bindings</b></em>' reference list feature.
+ * The meta object literal for the '<em><b>Wire Bindings</b></em>' containment reference list feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -1000,7 +1000,7 @@
EReference BEAN__WIRE_BINDINGS = eINSTANCE.getBean_WireBindings();
/**
- * The meta object literal for the '<em><b>Expression Bindings</b></em>' reference list feature.
+ * The meta object literal for the '<em><b>Expression Bindings</b></em>' containment reference list feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/javabean/JavaBeanPackage.java
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/javabean/JavaBeanPackage.java 2010-08-26 09:50:35 UTC (rev 24462)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/javabean/JavaBeanPackage.java 2010-08-26 10:13:56 UTC (rev 24463)
@@ -534,9 +534,9 @@
initEAttribute(getBean_BeanClass(), ecorePackage.getEString(), "beanClass", null, 0, 1, IBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getBean_CreateOnElement(), ecorePackage.getEString(), "createOnElement", null, 0, 1, IBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getBean_CreateOnElementNS(), ecorePackage.getEString(), "createOnElementNS", null, 0, 1, IBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getBean_ValueBindings(), this.getValue(), null, "valueBindings", null, 0, -1, IBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getBean_WireBindings(), this.getWiring(), null, "wireBindings", null, 0, -1, IBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getBean_ExpressionBindings(), this.getExpression(), null, "expressionBindings", null, 0, -1, IBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getBean_ValueBindings(), this.getValue(), null, "valueBindings", null, 0, -1, IBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getBean_WireBindings(), this.getWiring(), null, "wireBindings", null, 0, -1, IBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getBean_ExpressionBindings(), this.getExpression(), null, "expressionBindings", null, 0, -1, IBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
// Create resource
createResource(eNS_URI);
15 years, 4 months
JBoss Tools SVN: r24462 - trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model.
by jbosstools-commits@lists.jboss.org
Author: scabanovich
Date: 2010-08-26 05:50:35 -0400 (Thu, 26 Aug 2010)
New Revision: 24462
Modified:
trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/ESBResourceTree.java
Log:
https://jira.jboss.org/browse/JBIDE-6863
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/ESBResourceTree.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/ESBResourceTree.java 2010-08-26 09:48:31 UTC (rev 24461)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/ESBResourceTree.java 2010-08-26 09:50:35 UTC (rev 24462)
@@ -28,7 +28,9 @@
XModelObject[] os = object.getChildren();
List<XModelObject> list = new ArrayList<XModelObject>();
XModelObject r = FileSystemsHelper.getWebRoot(model);
- list.add(r);
+ if(r != null) {
+ list.add(r);
+ }
for (int i = 0; i < os.length; i++) {
String name = os[i].getAttributeValue(XModelObjectConstants.ATTR_NAME);
if(name.startsWith("src")) {
15 years, 4 months
JBoss Tools SVN: r24461 - trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions.
by jbosstools-commits@lists.jboss.org
Author: dgeraskov
Date: 2010-08-26 05:48:31 -0400 (Thu, 26 Aug 2010)
New Revision: 24461
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/DeleteConfigurationAction.java
Log:
https://jira.jboss.org/browse/JBIDE-6910
do not show dialog when nothing will be deleted.
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/DeleteConfigurationAction.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/DeleteConfigurationAction.java 2010-08-26 09:46:00 UTC (rev 24460)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/DeleteConfigurationAction.java 2010-08-26 09:48:31 UTC (rev 24461)
@@ -51,6 +51,17 @@
public void run() {
List selectedNonResources = getSelectedNonResources();
+ boolean ccSelected = false;
+ Iterator iter = selectedNonResources.iterator();
+ while (iter.hasNext() ) {
+ if (iter.next() instanceof ConsoleConfiguration) {
+ ccSelected = true;
+ break;
+ }
+ }
+
+ if (!ccSelected) return;
+
String question = HibernateConsoleMessages.DeleteConfigurationAction_do_you_wish_del_selected_config;
String title = HibernateConsoleMessages.DeleteConfigurationAction_delete_console_config;
if (selectedNonResources.size() > 1){
@@ -60,7 +71,7 @@
question += HibernateConsoleMessages.DeleteConfigurationAction_str_3;
if( MessageDialog.openConfirm( null, title, question)) {
- Iterator iter = selectedNonResources.iterator();
+ iter = selectedNonResources.iterator();
while (iter.hasNext() ) {
Object selElement = iter.next();
if (selElement instanceof ConsoleConfiguration) {
15 years, 4 months
JBoss Tools SVN: r24460 - trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions.
by jbosstools-commits@lists.jboss.org
Author: dgeraskov
Date: 2010-08-26 05:46:00 -0400 (Thu, 26 Aug 2010)
New Revision: 24460
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/DeleteConfigurationAction.java
Log:
https://jira.jboss.org/browse/JBIDE-6910
fix ClassCastException
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/DeleteConfigurationAction.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/DeleteConfigurationAction.java 2010-08-26 09:28:11 UTC (rev 24459)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/DeleteConfigurationAction.java 2010-08-26 09:46:00 UTC (rev 24460)
@@ -62,8 +62,11 @@
if( MessageDialog.openConfirm( null, title, question)) {
Iterator iter = selectedNonResources.iterator();
while (iter.hasNext() ) {
- ConsoleConfiguration element = (ConsoleConfiguration) iter.next();
- KnownConfigurations.getInstance().removeConfiguration(element, false);
+ Object selElement = iter.next();
+ if (selElement instanceof ConsoleConfiguration) {
+ ConsoleConfiguration element = (ConsoleConfiguration) selElement;
+ KnownConfigurations.getInstance().removeConfiguration(element, false);
+ }
}
part.refresh();
15 years, 4 months
JBoss Tools SVN: r24459 - branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model.
by jbosstools-commits@lists.jboss.org
Author: DartPeng
Date: 2010-08-26 05:28:11 -0400 (Thu, 26 Aug 2010)
New Revision: 24459
Added:
branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/Test.java
Log:
Added: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/Test.java
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/Test.java (rev 0)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/Test.java 2010-08-26 09:28:11 UTC (rev 24459)
@@ -0,0 +1,33 @@
+package org.jboss.tools.smooks.model;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.util.EContentAdapter;
+import org.jboss.tools.smooks.model.core.ICoreFactory;
+import org.jboss.tools.smooks.model.core.IGlobalParams;
+import org.jboss.tools.smooks.model.core.IParam;
+
+
+public class Test {
+
+ /**
+ * @param args
+ */
+ public static void main(String[] args) {
+ IGlobalParams params = ICoreFactory.eINSTANCE.createGlobalParams();
+ params.eAdapters().add(new EContentAdapter(){
+
+ @Override
+ public void notifyChanged(Notification notification) {
+ System.out.println("change");
+ super.notifyChanged(notification);
+ }
+
+
+
+ });
+ IParam pp = ICoreFactory.eINSTANCE.createParam();
+ params.getParams().add(pp);
+ pp.setName("name");
+ }
+
+}
Property changes on: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/Test.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
15 years, 4 months
JBoss Tools SVN: r24458 - in trunk: jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test and 4 other directories.
by jbosstools-commits@lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2010-08-26 05:24:53 -0400 (Thu, 26 Aug 2010)
New Revision: 24458
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/templates/EditedTemplateForUnknownTag.xml
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/templates/SetTemplateForUnknownTag.xml
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/templates/UnknownTemplate.xml
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/UnknownTagDialogVariables.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3577Test.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/templates/SetTemplateForUnknownTagTest.java
trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/src/org/jboss/tools/ui/bot/test/JBTSWTBotTestCase.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/TestDomUtil.java
Log:
Fixes for JBT 3.2.0.M2
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/templates/EditedTemplateForUnknownTag.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/templates/EditedTemplateForUnknownTag.xml 2010-08-26 06:29:45 UTC (rev 24457)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/templates/EditedTemplateForUnknownTag.xml 2010-08-26 09:24:53 UTC (rev 24458)
@@ -1,39 +1,36 @@
-<BODY ID="__content__area__">
-<DIV STYLE="-moz-user-modify: read-write;">
-<DIV STYLE="display: none; -moz-user-modify: read-only;">
-<H1 STYLE="-moz-user-modify: read-write;">
-Input User Name Page
-</H1>
+<BODY id="__content__area__" >
+<DIV style="-moz-user-modify: read-write;" >
+<DIV style="display: none; -moz-user-modify: read-only;" title="head" >
</DIV>
-<DIV>
-<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;">
-<TR>
-<TD>
-<DIV>
-<H1 STYLE="-moz-user-modify: read-write;">
-<SPAN CLASS="vpe-text">
+<DIV title="body" >
+<TABLE style="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;" title="f:view" >
+<TR title="f:view" >
+<TD title="f:view" >
+<DIV title="f:view" >
+<H1 style="-moz-user-modify: read-write;" title="h1" >
+<SPAN class="vpe-text" title="h:outputText value: #{Message.header}" >
Hello Demo Application
</SPAN>
</H1>
-<B CLASS="__any__tag__caption" STYLE="border: 1px solid green; -moz-user-modify: read-only;">
+<B class="__any__tag__caption" style="border: 1px solid green; -moz-user-modify: read-only;" title="h:unknowntag" >
</B>
-<UL STYLE="color: red; -moz-user-modify: read-only;">
-<LI>
+<UL style="color: red; -moz-user-modify: read-only;" title="h:messages style: color: red" >
+<LI title="h:messages style: color: red" >
Error Messages
</LI>
</UL>
-<FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;">
-<SPAN CLASS="vpe-text">
+<FORM style="border: 1px dotted rgb(255, 102, 0); padding: 5px;" title="h:form id: greetingForm" >
+<SPAN class="vpe-text" title="h:outputText value: #{Message.prompt_message}" >
Name:
</SPAN>
-<SPAN CLASS="vpe-text">
-<SPAN CLASS="vpe-text">
+<SPAN class="vpe-text" title="h:inputText value: #{user.name} required: true" >
+<SPAN class="vpe-text" title="h:inputText value: #{user.name} required: true" >
</SPAN>
-<INPUT VALUE="#{user.name}"/>
-
+<INPUT value="#{user.name}" title="h:inputText value: #{user.name} required: true" >
+</INPUT>
</SPAN>
-<INPUT TYPE="button" VALUE="Say Hello!" STYLE="-moz-user-modify: read-only;"/>
-
+<INPUT type="button" title="h:commandButton action: hello value: Say Hello!" value="Say Hello!" style="-moz-user-modify: read-only;" >
+</INPUT>
</FORM>
</DIV>
</TD>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/templates/SetTemplateForUnknownTag.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/templates/SetTemplateForUnknownTag.xml 2010-08-26 06:29:45 UTC (rev 24457)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/templates/SetTemplateForUnknownTag.xml 2010-08-26 09:24:53 UTC (rev 24458)
@@ -1,41 +1,39 @@
-<BODY ID="__content__area__">
-<DIV STYLE="-moz-user-modify: read-write;">
-<DIV STYLE="display: none; -moz-user-modify: read-only;">
-<H1 STYLE="-moz-user-modify: read-write;">
-Input User Name Page
-</H1>
+<BODY id="__content__area__" >
+<DIV style="-moz-user-modify: read-write;" >
+<DIV style="display: none; -moz-user-modify: read-only;" title="head" >
</DIV>
-<DIV>
-<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;">
-<TR>
-<TD>
-<DIV>
-<H1 STYLE="-moz-user-modify: read-write;">
-<SPAN CLASS="vpe-text">
+<DIV title="body" >
+<TABLE style="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;" title="f:view" >
+<TR title="f:view" >
+<TD title="f:view" >
+<DIV title="f:view" >
+<H1 style="-moz-user-modify: read-write;" title="h1" >
+<SPAN class="vpe-text" title="h:outputText value: #{Message.header}" >
Hello Demo Application
</SPAN>
</H1>
-<B CLASS="__any__tag__caption" STYLE="border: 1px solid green; font-family: Arial; color: black; -moz-user-modify: read-only;">
-myValue<BR STYLE="font-style: italic; color: green; -moz-user-modify: read-only;"/>
-
+<B class="__any__tag__caption" style="border: 1px solid green; color: black; font-family: Arial; -moz-user-modify: read-only;" title="h:unknowntag" >
+myValue
+<BR style="font-style: italic; color: green; -moz-user-modify: read-only;" >
+</BR>
</B>
-<UL STYLE="color: red; -moz-user-modify: read-only;">
-<LI>
+<UL style="color: red; -moz-user-modify: read-only;" title="h:messages style: color: red" >
+<LI title="h:messages style: color: red" >
Error Messages
</LI>
</UL>
-<FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;">
-<SPAN CLASS="vpe-text">
+<FORM style="border: 1px dotted rgb(255, 102, 0); padding: 5px;" title="h:form id: greetingForm" >
+<SPAN class="vpe-text" title="h:outputText value: #{Message.prompt_message}" >
Name:
</SPAN>
-<SPAN CLASS="vpe-text">
-<SPAN CLASS="vpe-text">
+<SPAN class="vpe-text" title="h:inputText value: #{user.name} required: true" >
+<SPAN class="vpe-text" title="h:inputText value: #{user.name} required: true" >
</SPAN>
-<INPUT VALUE="#{user.name}"/>
-
+<INPUT value="#{user.name}" title="h:inputText value: #{user.name} required: true" >
+</INPUT>
</SPAN>
-<INPUT TYPE="button" VALUE="Say Hello!" STYLE="-moz-user-modify: read-only;"/>
-
+<INPUT type="button" title="h:commandButton action: hello value: Say Hello!" value="Say Hello!" style="-moz-user-modify: read-only;" >
+</INPUT>
</FORM>
</DIV>
</TD>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/templates/UnknownTemplate.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/templates/UnknownTemplate.xml 2010-08-26 06:29:45 UTC (rev 24457)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/templates/UnknownTemplate.xml 2010-08-26 09:24:53 UTC (rev 24458)
@@ -1,41 +1,40 @@
-<BODY ID="__content__area__">
-<DIV STYLE="-moz-user-modify: read-write;">
-<DIV STYLE="display: none; -moz-user-modify: read-only;">
-<H1 STYLE="-moz-user-modify: read-write;">
-Input User Name Page
-</H1>
+<BODY id="__content__area__">
+<DIV style="-moz-user-modify: read-write;">
+<DIV style="display: none; -moz-user-modify: read-only;" title="head">
</DIV>
-<DIV>
-<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;">
-<TR>
-<TD>
-<DIV>
-<H1 STYLE="-moz-user-modify: read-write;">
-<SPAN CLASS="vpe-text">
+<DIV title="body">
+<TABLE style="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;" title="f:view">
+<TR title="f:view">
+<TD title="f:view">
+<DIV title="f:view">
+<H1 style="-moz-user-modify: read-write;" title="h1">
+<SPAN class="vpe-text" title="h:outputText
+value: #{Message.header}">
Hello Demo Application
</SPAN>
</H1>
-<DIV CLASS="__any__tag__caption" STYLE="border: 1px solid green; -moz-user-modify: read-only;">
-h:unknowntag<BR STYLE="font-style: italic; color: green; -moz-user-modify: read-only;"/>
-
+<DIV class="__any__tag__caption" style="border: 1px solid green; -moz-user-modify: read-only;" title="h:unknowntag">
+h:unknowntag
+<BR style="font-style: italic; color: green; -moz-user-modify: read-only;">
+</BR>
</DIV>
-<UL STYLE="color: red; -moz-user-modify: read-only;">
-<LI>
+<UL style="color: red; -moz-user-modify: read-only;" title="h:messages style: color: red">
+<LI title="h:messages style: color: red">
Error Messages
</LI>
</UL>
-<FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;">
-<SPAN CLASS="vpe-text">
+<FORM style="border: 1px dotted rgb(255, 102, 0); padding: 5px;" title="h:form id: greetingForm">
+<SPAN class="vpe-text" title="h:outputText value: #{Message.prompt_message}">
Name:
</SPAN>
-<SPAN CLASS="vpe-text">
-<SPAN CLASS="vpe-text">
+<SPAN class="vpe-text" title="h:inputText value: #{user.name} required: true">
+<SPAN class="vpe-text" title="h:inputText value: #{user.name} required: true">
</SPAN>
-<INPUT VALUE="#{user.name}"/>
-
+<INPUT value="#{user.name}" title="h:inputText value: #{user.name} required: true">
+</INPUT>
</SPAN>
-<INPUT TYPE="button" VALUE="Say Hello!" STYLE="-moz-user-modify: read-only;"/>
-
+<INPUT type="button" title="h:commandButton action: hello value: Say Hello!" value="Say Hello!" style="-moz-user-modify: read-only;">
+</INPUT>
</FORM>
</DIV>
</TD>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/UnknownTagDialogVariables.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/UnknownTagDialogVariables.java 2010-08-26 06:29:45 UTC (rev 24457)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/UnknownTagDialogVariables.java 2010-08-26 09:24:53 UTC (rev 24458)
@@ -2,10 +2,10 @@
public class UnknownTagDialogVariables {
- public static final String DIALOG_TITLE = "Unknown tag template"; //$NON-NLS-1$
- public static final String TAG_NAME_FIELD = "Tag Name:"; //$NON-NLS-1$
+ public static final String DIALOG_TITLE = "User specified tag template"; //$NON-NLS-1$
+ public static final String TAG_NAME_FIELD = "Tag name:"; //$NON-NLS-1$
public static final String TAG_URI_FIELD = "Tag URI:"; //$NON-NLS-1$
- public static final String DISPLAY_TAG = "Tag For Display:"; //$NON-NLS-1$
+ public static final String DISPLAY_TAG = "Tag for display:"; //$NON-NLS-1$
public static final String ALLOW_CHILDREN_CHECKBOX = "Allow tag children:"; //$NON-NLS-1$
public static final String VALUE_FIELD = "Value:"; //$NON-NLS-1$
public static final String TAG_STYLE_FIELD = "Tag style:"; //$NON-NLS-1$
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3577Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3577Test.java 2010-08-26 06:29:45 UTC (rev 24457)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3577Test.java 2010-08-26 09:24:53 UTC (rev 24458)
@@ -47,7 +47,7 @@
bot.button("Clear").click(); //$NON-NLS-1$
bot.button("Apply").click(); //$NON-NLS-1$
bot.button("OK").click(); //$NON-NLS-1$
- assertEquals("cssclass{\r\t\r}@CHARSET \"UTF-8\";\n}", bot.editorByTitle(CSS_FILE_NAME+".css").toTextEditor().getText()); //$NON-NLS-1$ //$NON-NLS-2$
+ assertEquals("cssclass{\r\t\r}@CHARSET \"UTF-8\";", bot.editorByTitle(CSS_FILE_NAME+".css").toTextEditor().getText()); //$NON-NLS-1$ //$NON-NLS-2$
bot.editorByTitle(CSS_FILE_NAME+".css").close(); //$NON-NLS-1$
}
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/templates/SetTemplateForUnknownTagTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/templates/SetTemplateForUnknownTagTest.java 2010-08-26 06:29:45 UTC (rev 24457)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/templates/SetTemplateForUnknownTagTest.java 2010-08-26 09:24:53 UTC (rev 24458)
@@ -6,6 +6,7 @@
import org.jboss.tools.jsf.ui.bot.test.JSFAutoTestCase;
import org.jboss.tools.jsf.ui.bot.test.UnknownTagDialogVariables;
import org.jboss.tools.ui.bot.ext.CompareUtils;
+import org.jboss.tools.ui.bot.ext.types.IDELabel;
import org.jboss.tools.ui.bot.test.WidgetVariables;
public class SetTemplateForUnknownTagTest extends JSFAutoTestCase {
@@ -31,7 +32,7 @@
bot.toolbarButtonWithTooltip(WidgetVariables.PREFERENCES).click();
bot.shell(WidgetVariables.PREF_FILTER_SHELL_TITLE).activate();
bot.tabItem(WidgetVariables.VPE_TEMPLATES_TAB).activate();
- bot.button(WidgetVariables.ADD_BUTTON).click();
+ bot.button(IDELabel.Button.ADD).click();
bot.shell(UnknownTagDialogVariables.DIALOG_TITLE).activate();
bot.textWithLabel(UnknownTagDialogVariables.TAG_NAME_FIELD).setText(TAG_NAME);
bot.textWithLabel(UnknownTagDialogVariables.TAG_URI_FIELD).setText(TAG_URI);
@@ -58,7 +59,7 @@
bot.table().select(0);
try {
checkTable(bot.table());
- bot.button(WidgetVariables.EDIT_BUTTON).click();
+ bot.button(IDELabel.Button.EDIT).click();
bot.shell(UnknownTagDialogVariables.DIALOG_TITLE).activate();
bot.textWithLabel(UnknownTagDialogVariables.TAG_URI_FIELD).setText(""); //$NON-NLS-1$
bot.checkBoxWithLabel(UnknownTagDialogVariables.ALLOW_CHILDREN_CHECKBOX)
Modified: trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/src/org/jboss/tools/ui/bot/test/JBTSWTBotTestCase.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/src/org/jboss/tools/ui/bot/test/JBTSWTBotTestCase.java 2010-08-26 06:29:45 UTC (rev 24457)
+++ trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/src/org/jboss/tools/ui/bot/test/JBTSWTBotTestCase.java 2010-08-26 09:24:53 UTC (rev 24458)
@@ -133,6 +133,8 @@
@Override
protected void setUp() throws Exception {
+ // close Report Usage Window
+ jbt.closeReportUsageWindowIfOpened(false);
activePerspective();
try {
bot.viewByTitle(WidgetVariables.WELCOME).close();
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/TestDomUtil.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/TestDomUtil.java 2010-08-26 06:29:45 UTC (rev 24457)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/TestDomUtil.java 2010-08-26 09:24:53 UTC (rev 24458)
@@ -295,8 +295,8 @@
+ "\" but pattern is \"" + regex + "\""); //$NON-NLS-1$ //$NON-NLS-2$
}
- } else if (!modelString.equals(vpeString)) {
- throw new ComparisonException("string is\"" + vpeString //$NON-NLS-1$
+ } else if (!modelString.equals(vpeString.replaceAll("\n", " "))) {
+ throw new ComparisonException("string is\"" + vpeString.replaceAll("\n", " ") //$NON-NLS-1$
+ "\" but must be \"" + modelString + "\""); //$NON-NLS-1$ //$NON-NLS-2$
}
15 years, 4 months