JBoss Tools SVN: r11607 - trunk/common/tests/org.jboss.tools.common.el.core.test/src/org/jboss/tools/common/el/core/test.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-11-07 05:59:37 -0500 (Fri, 07 Nov 2008)
New Revision: 11607
Modified:
trunk/common/tests/org.jboss.tools.common.el.core.test/src/org/jboss/tools/common/el/core/test/ELParserTest.java
Log:
JBIDE-3132
Modified: trunk/common/tests/org.jboss.tools.common.el.core.test/src/org/jboss/tools/common/el/core/test/ELParserTest.java
===================================================================
--- trunk/common/tests/org.jboss.tools.common.el.core.test/src/org/jboss/tools/common/el/core/test/ELParserTest.java 2008-11-07 08:25:49 UTC (rev 11606)
+++ trunk/common/tests/org.jboss.tools.common.el.core.test/src/org/jboss/tools/common/el/core/test/ELParserTest.java 2008-11-07 10:59:37 UTC (rev 11607)
@@ -13,6 +13,7 @@
import java.util.List;
import java.util.Random;
+import org.jboss.tools.common.el.core.model.ELInstance;
import org.jboss.tools.common.el.core.model.ELModel;
import org.jboss.tools.common.el.core.parser.ELParser;
import org.jboss.tools.common.el.core.parser.ELParserFactory;
@@ -59,6 +60,18 @@
checkCorrectEL(t, "#{a.b(7 + 8) * (4 / 2 - 1)/c.d}");
}
+ /**
+ * JBIDE-3132 An OutOfMemory exception is thrown by Code assist for "#{messages[ "
+ */
+ public void testJBIDE3132() {
+ ELParser parser = ELParserUtil.getJbossFactory().createParser();
+ String el = "#{messages[";
+ ELModel model = parser.parse(el);
+ List<ELInstance> is = model.getInstances();
+ assertEquals(1, is.size());
+ assertEquals(el, is.get(0).getText());
+ }
+
public void testElEmptyOperator() {
Tokenizer t = TokenizerFactory.createJbossTokenizer();
checkCorrectEL(t, "#{empty a}");
17 years, 5 months
JBoss Tools SVN: r11606 - in trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks: javabean/ui and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2008-11-07 03:25:49 -0500 (Fri, 07 Nov 2008)
New Revision: 11606
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/JavaBeanConfigWizardPage.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksFormEditor.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksNormalContentEditFormPage.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/AbstractFileSelectionWizardPage.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/AbstractXMLModelAnalyzer.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java
Log:
JBIDE-3095
modify some code for make the NormalPage to know which resourceconfigs should be hide.
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java 2008-11-07 05:50:50 UTC (rev 11605)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java 2008-11-07 08:25:49 UTC (rev 11606)
@@ -474,9 +474,9 @@
}
if (!(sourceObject instanceof JavaBeanModel)
|| !(targetObject instanceof JavaBeanModel)) {
- throw new RuntimeException(
- "Can't load the source/target data from Smooks configuration file.");
- // return MappingResourceConfigList.createEmptyList();
+// throw new RuntimeException(
+// "[JavaBeanAnalyzer]Can't load the source/target data from Smooks configuration file.");
+ return MappingResourceConfigList.createEmptyList();
}
MappingResourceConfigList resourceConfigList = new MappingResourceConfigList();
JavaBeanModel source = (JavaBeanModel) sourceObject;
@@ -551,7 +551,7 @@
if (childTargetModel == null) {
// TODO if can't find the child node , throw exception
// MODIFY by Dart 2008.11.07
- throw new RuntimeException("There isn't any child property named \""
+ throw new RuntimeException("[JavaBeanAnalyzer]There isn't any child property named \""
+ property + "\" of \"" + target.getName()
+ "\" JavaBean model");
}
@@ -595,7 +595,7 @@
}else{
// TODO if can't find the class, throw exception
// MODIFY by Dart 08.11.07
- throw new RuntimeException("JavaBean \"" + parentModel.getName()+ "\" can't load its class.");
+ throw new RuntimeException("[JavaBeanAnalyzer]JavaBean \"" + parentModel.getName()+ "\" can't load its class.");
}
if (s != null) {
for (int i = 0; i < s.length; i++) {
@@ -606,7 +606,7 @@
if (child == null){
// TODO if can't find the child node , throw exception
// MODIFY by Dart 2008.11.07
- throw new RuntimeException("There isn't any child property named \""
+ throw new RuntimeException("[JavaBeanAnalyzer]There isn't any child property named \""
+ childName + "\" of \"" + parentModel.getName()
+ "\" JavaBean model");
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/JavaBeanConfigWizardPage.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/JavaBeanConfigWizardPage.java 2008-11-07 05:50:50 UTC (rev 11605)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/JavaBeanConfigWizardPage.java 2008-11-07 08:25:49 UTC (rev 11606)
@@ -42,6 +42,7 @@
private JavaBeanModelLoadComposite javaPropertySelectComposite;
public JavaBeanModel getJavaBeanModel(){
+ if(javaPropertySelectComposite == null) return null;
return javaPropertySelectComposite.getCheckedJavaBeanModel();
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksFormEditor.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksFormEditor.java 2008-11-07 05:50:50 UTC (rev 11605)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksFormEditor.java 2008-11-07 08:25:49 UTC (rev 11606)
@@ -34,6 +34,7 @@
import org.eclipse.ui.views.properties.IPropertySheetPage;
import org.eclipse.ui.views.properties.tabbed.ITabbedPropertySheetPageContributor;
import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
+import org.jboss.tools.smooks.analyzer.MappingResourceConfigList;
import org.jboss.tools.smooks.analyzer.NormalSmooksModelBuilder;
import org.jboss.tools.smooks.analyzer.NormalSmooksModelPackage;
import org.jboss.tools.smooks.model.DocumentRoot;
@@ -52,6 +53,7 @@
ITabbedPropertySheetPageContributor {
SmooksGraphicalFormPage graphicalPage = null;
+
public SmooksGraphicalFormPage getGraphicalPage() {
return graphicalPage;
}
@@ -98,12 +100,17 @@
"Mapping");
int index = this.addPage(this.graphicalPage);
this.setPageText(index, "Graph");
- normalPage = new SmooksNormalContentEditFormPage(this, "configuration",
- "Configuration", null);
+ normalPage = new SmooksNormalContentEditFormPage(this,
+ "configuration", "Configuration", null);
index = this.addPage(normalPage);
setPageText(index, "Configuration");
// Set a default NormalPacakge to Normal Page
- this.refreshNormalPage(Collections.EMPTY_LIST);
+ MappingResourceConfigList mappingResourceConfig = graphicalPage
+ .getMappingResourceConfigList();
+ if (mappingResourceConfig != null) {
+ refreshNormalPage(mappingResourceConfig
+ .getRelationgResourceConfigList());
+ }
if (onlyShowTextEditor) {
removeGraphicalFormPage();
}
@@ -210,8 +217,8 @@
@Override
public void doSave(IProgressMonitor monitor) {
- if(onlyShowTextEditor){
- if(textEdtior != null){
+ if (onlyShowTextEditor) {
+ if (textEdtior != null) {
textEdtior.doSave(monitor);
fireEditorDirty(false);
return;
@@ -228,8 +235,8 @@
@Override
public void doSaveAs() {
- if(onlyShowTextEditor){
- if(textEdtior != null){
+ if (onlyShowTextEditor) {
+ if (textEdtior != null) {
textEdtior.doSaveAs();
}
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java 2008-11-07 05:50:50 UTC (rev 11605)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java 2008-11-07 08:25:49 UTC (rev 11606)
@@ -192,6 +192,11 @@
private List selectionChangeListener = new ArrayList();
private ISelection selection;
protected MappingResourceConfigList mappingResourceConfigList;
+
+ public MappingResourceConfigList getMappingResourceConfigList() {
+ return mappingResourceConfigList;
+ }
+
protected AdapterFactoryEditingDomain editingDomain;
private boolean canSaveFile = true;
@@ -1012,9 +1017,9 @@
try {
this.initTransformViewerModel((IEditorSite) getSite(),
getEditorInput());
- if (mappingResourceConfigList != null)
- callParentRefillNormalModelInfor(mappingResourceConfigList
- .getRelationgResourceConfigList());
+// if (mappingResourceConfigList != null)
+// callParentRefillNormalModelInfor(mappingResourceConfigList
+// .getRelationgResourceConfigList());
} catch (IOWrappedException ex) {
MessageDialog.openWarning(getSite().getShell(), "Waring",
"Exceptions occurd during parsing Smooks file, no worries");
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksNormalContentEditFormPage.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksNormalContentEditFormPage.java 2008-11-07 05:50:50 UTC (rev 11605)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksNormalContentEditFormPage.java 2008-11-07 08:25:49 UTC (rev 11606)
@@ -28,6 +28,7 @@
import org.eclipse.ui.forms.widgets.FormToolkit;
import org.eclipse.ui.forms.widgets.ScrolledForm;
import org.eclipse.ui.forms.widgets.Section;
+import org.jboss.tools.smooks.analyzer.MappingResourceConfigList;
import org.jboss.tools.smooks.analyzer.NormalSmooksModelPackage;
import org.jboss.tools.smooks.model.ParamType;
import org.jboss.tools.smooks.model.ResourceConfigType;
@@ -116,7 +117,7 @@
ParamType typeParam = SmooksFactory.eINSTANCE.createParamType();
typeParam.setName(SmooksModelConstants.STREAM_FILTER_TYPE);
transformType.getParam().add(typeParam);
-
+
return transformType;
}
@@ -178,7 +179,7 @@
private void setTransformType(String type) {
if (this.transformType != null) {
SmooksModelUtils.setTransformType(transformType, type);
- ((SmooksFormEditor)getEditor()).fireEditorDirty(true);
+ ((SmooksFormEditor) getEditor()).fireEditorDirty(true);
}
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/AbstractFileSelectionWizardPage.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/AbstractFileSelectionWizardPage.java 2008-11-07 05:50:50 UTC (rev 11605)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/AbstractFileSelectionWizardPage.java 2008-11-07 08:25:49 UTC (rev 11606)
@@ -52,6 +52,7 @@
public Object getReturnValue() {
try {
String path = getFilePath();
+ if(path == null) return null;
path = AbstractXMLModelAnalyzer.parseFilePath(path);
returnObject = this.loadedTheObject(path);
} catch (Exception e) {
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/AbstractXMLModelAnalyzer.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/AbstractXMLModelAnalyzer.java 2008-11-07 05:50:50 UTC (rev 11605)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/AbstractXMLModelAnalyzer.java 2008-11-07 08:25:49 UTC (rev 11606)
@@ -45,8 +45,9 @@
public AbstractXMLModelAnalyzer(String paramKey) {
this.parmaKey = paramKey;
}
-
- public static String parseFilePath(String path) throws InvocationTargetException{
+
+ public static String parseFilePath(String path)
+ throws InvocationTargetException {
int index = path.indexOf(FILE_PRIX);
if (index != -1) {
path = path.substring(index + FILE_PRIX.length(), path.length());
@@ -61,10 +62,12 @@
if (file.exists()) {
path = file.getLocation().toOSString();
} else {
- throw new InvocationTargetException(new Exception("file dosen't exist" + path + " on the workspace."));
+ throw new InvocationTargetException(new Exception(
+ "file dosen't exist" + path + " on the workspace."));
}
- }else{
- throw new InvocationTargetException(new Exception("Illegal file path : " + path + "."));
+ } else {
+ throw new InvocationTargetException(new Exception(
+ "Illegal file path : " + path + "."));
}
}
return path;
@@ -87,9 +90,9 @@
}
}
if (path == null) {
- return null;
- // throw new InvocationTargetException(new Exception(
- // "xml file can't be found in the .graph file."));
+ return null;
+// throw new InvocationTargetException(new Exception(
+// "xml file can't be found in the .graph file."));
}
path = parseFilePath(path);
XMLObjectAnalyzer objectBuilder = new XMLObjectAnalyzer();
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java 2008-11-07 05:50:50 UTC (rev 11605)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java 2008-11-07 08:25:49 UTC (rev 11606)
@@ -224,9 +224,9 @@
// TODO if the type of input source/target data is illegal , throw
// exceptions.
// MODIFY by Dart 2008.11.07
- throw new RuntimeException(
- "Can't load the source/target data from Smooks configuration file.");
- // return MappingResourceConfigList.createEmptyList();
+// throw new RuntimeException(
+// "[XMLBeanAnalyzer]Can't load the source/target data from Smooks configuration file.");
+ return MappingResourceConfigList.createEmptyList();
}
AbstractXMLObject sourceRoot = (AbstractXMLObject) sourceObject;
JavaBeanModel sourceTarget = (JavaBeanModel) targetObject;
@@ -245,7 +245,7 @@
if (source == null) {
// TODO if can't find the root , throw exception
// MODIFY by Dart 2008.11.07
- throw new RuntimeException("Can't find the root node.");
+ throw new RuntimeException("[XML2JavaAnalyzer]Can't find the root node.");
// return MappingResourceConfigList.createEmptyList();
}
@@ -340,7 +340,7 @@
if (newRoot == null) {
// TODO If can't find the element , throw exception
// MODIFY by Dart , 2008.11.07
- throw new RuntimeException("Can't find the \""+ newSelector + "\" node.");
+ throw new RuntimeException("[XML2JavaAnalyzer]Can't find the \""+ newSelector + "\" node.");
}
createMappingResourceConfigList(configList, listType,
resourceConfig1, newRoot, targetBean);
@@ -350,7 +350,7 @@
if (source == null) {
// TODO If can't find the element , throw exception
// MODIFY by Dart , 2008.11.07
- throw new RuntimeException("Can't find the \""+ selector + "\" node.");
+ throw new RuntimeException("[XML2JavaAnalyzer]Can't find the \""+ selector + "\" node.");
}
if (source != null) {
MappingModel mapping = new MappingModel(source, targetBean);
17 years, 5 months
JBoss Tools SVN: r11605 - in trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks: xml2java/analyzer and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2008-11-07 00:50:50 -0500 (Fri, 07 Nov 2008)
New Revision: 11605
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksFormEditor.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksNormalContentEditFormPage.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java
Log:
JBIDE-2988
Throw several exceptions during analyzing java2java config file
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksFormEditor.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksFormEditor.java 2008-11-07 05:20:18 UTC (rev 11604)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksFormEditor.java 2008-11-07 05:50:50 UTC (rev 11605)
@@ -98,10 +98,10 @@
"Mapping");
int index = this.addPage(this.graphicalPage);
this.setPageText(index, "Graph");
- normalPage = new SmooksNormalContentEditFormPage(this, "normal",
- "Normal Edition", null);
+ normalPage = new SmooksNormalContentEditFormPage(this, "configuration",
+ "Configuration", null);
index = this.addPage(normalPage);
- setPageText(index, "Normal");
+ setPageText(index, "Configuration");
// Set a default NormalPacakge to Normal Page
this.refreshNormalPage(Collections.EMPTY_LIST);
if (onlyShowTextEditor) {
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksNormalContentEditFormPage.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksNormalContentEditFormPage.java 2008-11-07 05:20:18 UTC (rev 11604)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksNormalContentEditFormPage.java 2008-11-07 05:50:50 UTC (rev 11605)
@@ -91,7 +91,7 @@
GridLayout gridLayout = UIUtils.createGeneralFormEditorLayout(1);
resourceBlock.createContent(managedForm);
Composite rootMainControl = form.getBody();
- form.setText("Normal Page");
+ form.setText("Configuration Page");
createSmooksTypeGUI(rootMainControl, tool);
form.getBody().setLayout(gridLayout);
form.pack();
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java 2008-11-07 05:20:18 UTC (rev 11604)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java 2008-11-07 05:50:50 UTC (rev 11605)
@@ -221,19 +221,33 @@
}
if (!(sourceObject instanceof AbstractXMLObject)
|| !(targetObject instanceof JavaBeanModel)) {
- return MappingResourceConfigList.createEmptyList();
+ // TODO if the type of input source/target data is illegal , throw
+ // exceptions.
+ // MODIFY by Dart 2008.11.07
+ throw new RuntimeException(
+ "Can't load the source/target data from Smooks configuration file.");
+ // return MappingResourceConfigList.createEmptyList();
}
AbstractXMLObject sourceRoot = (AbstractXMLObject) sourceObject;
JavaBeanModel sourceTarget = (JavaBeanModel) targetObject;
ResourceConfigType rootResourceConfig = findFirstMappingResourceConfig(listType);
// if can't find the root , return null
- if (rootResourceConfig == null)
- return null;
+ if (rootResourceConfig == null) {
+ // TODO if can't find the org.milyn.javabean.BeanPopulator , throw
+ // exception
+ // MODIFY by Dart 2008.11.07
+// throw new RuntimeException("Can't parse the config file.");
+ return null;
+ }
String xmlName = rootResourceConfig.getSelector();
AbstractXMLObject source = findXMLObjectByName(xmlName, sourceRoot);
- if (source == null)
- return MappingResourceConfigList.createEmptyList();
+ if (source == null) {
+ // TODO if can't find the root , throw exception
+ // MODIFY by Dart 2008.11.07
+ throw new RuntimeException("Can't find the root node.");
+ // return MappingResourceConfigList.createEmptyList();
+ }
MappingResourceConfigList rcl = new MappingResourceConfigList();
this.createMappingResourceConfigList(rcl, listType, rootResourceConfig,
@@ -323,11 +337,21 @@
if (newSelector == null)
return;
AbstractXMLObject newRoot = findXMLObjectByName(newSelector, root);
+ if (newRoot == null) {
+ // TODO If can't find the element , throw exception
+ // MODIFY by Dart , 2008.11.07
+ throw new RuntimeException("Can't find the \""+ newSelector + "\" node.");
+ }
createMappingResourceConfigList(configList, listType,
resourceConfig1, newRoot, targetBean);
} else {
AbstractXMLObject source = findXMLObjectWithSelectorString(
selector, root);
+ if (source == null) {
+ // TODO If can't find the element , throw exception
+ // MODIFY by Dart , 2008.11.07
+ throw new RuntimeException("Can't find the \""+ selector + "\" node.");
+ }
if (source != null) {
MappingModel mapping = new MappingModel(source, targetBean);
UIUtils.assignBindingPropertyToMappingModel(currentBinding,
17 years, 5 months
JBoss Tools SVN: r11604 - trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/WebContent/pages.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-11-07 00:20:18 -0500 (Fri, 07 Nov 2008)
New Revision: 11604
Added:
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/WebContent/pages/greeting1.xhtml
Log:
simplify tests and fix for test errors
Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/WebContent/pages/greeting1.xhtml
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/WebContent/pages/greeting1.xhtml (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/WebContent/pages/greeting1.xhtml 2008-11-07 05:20:18 UTC (rev 11604)
@@ -0,0 +1,16 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core">
+
+ <f:loadBundle basename="resources" var="msg" />
+ <ui:composition template="/templates/common.xhtml">
+ <ui:define name="pageTitle">Greeting to User</ui:define>
+ <ui:define name="pageHeader">Facelets Greeting Page</ui:define>
+ <ui:define name="body">
+ <h:outputText value="#{msg.greeting}" />
+ #{msg.greeting} #{person.name}!
+ </ui:define>
+ </ui:composition>
+</html>
\ No newline at end of file
Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/WebContent/pages/greeting1.xhtml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
17 years, 5 months
JBoss Tools SVN: r11603 - trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-11-07 00:18:50 -0500 (Fri, 07 Nov 2008)
New Revision: 11603
Modified:
trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/ContentAssistantTestCase.java
trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/Jbide1791Test.java
trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide2437Test.java
Log:
simplify tests and fix for test errors
Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/ContentAssistantTestCase.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/ContentAssistantTestCase.java 2008-11-07 05:18:30 UTC (rev 11602)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/ContentAssistantTestCase.java 2008-11-07 05:18:50 UTC (rev 11603)
@@ -35,16 +35,6 @@
if (editorPart instanceof JSPMultiPageEditor)
jspEditor = (JSPMultiPageEditor) editorPart;
- // Delay for 3 seconds so that
- // the Favorites view can be seen.
- try {
- JobUtils.waitForIdle();;
- } catch (Exception e) {
- e.printStackTrace();
- assertTrue("Waiting for the jobs to complete has failed.", false);
- }
- TestUtil.delay(3000);
-
jspTextEditor = jspEditor.getJspEditor();
viewer = jspTextEditor.getTextViewer();
document = viewer.getDocument();
Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/Jbide1791Test.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/Jbide1791Test.java 2008-11-07 05:18:30 UTC (rev 11602)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/Jbide1791Test.java 2008-11-07 05:18:50 UTC (rev 11603)
@@ -13,7 +13,9 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.eclipse.core.resources.IResource;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.FindReplaceDocumentAdapter;
+import org.eclipse.jface.text.IRegion;
import org.eclipse.jface.text.contentassist.ICompletionProposal;
import org.jboss.tools.common.test.util.TestProjectProvider;
@@ -31,6 +33,7 @@
public static Test suite() {
return new TestSuite(Jbide1791Test.class);
}
+
public void setUp() throws Exception {
provider = new TestProjectProvider("org.jboss.tools.jst.jsp.test", null, PROJECT_NAME,false);
project = provider.getProject();
@@ -52,9 +55,17 @@
"h6",
"hr"
};
- final ICompletionProposal[] rst = checkProposals(PAGE_NAME,353, proposals, false);
+ openEditor(PAGE_NAME);
+ IRegion reg=null;
+ try {
+ reg = new FindReplaceDocumentAdapter(this.document).find(0, "</style>", true, false, false, false);
+ } catch (BadLocationException e) {
+ fail(e.getMessage());
+ }
+ final ICompletionProposal[] rst = checkProposals(PAGE_NAME,reg.getOffset(), proposals, false);
checkResult(rst,proposals);
+ closeEditor();
}
/**
* @param rst
Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide2437Test.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide2437Test.java 2008-11-07 05:18:30 UTC (rev 11602)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide2437Test.java 2008-11-07 05:18:50 UTC (rev 11603)
@@ -4,6 +4,9 @@
import junit.framework.TestSuite;
import org.eclipse.core.resources.IResource;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.FindReplaceDocumentAdapter;
+import org.eclipse.jface.text.IRegion;
import org.eclipse.jface.text.contentassist.ICompletionProposal;
import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
@@ -21,11 +24,8 @@
boolean makeCopy = false;
private static final String PROJECT_NAME = "JsfJbide1704Test";
- private static final String PAGE_NAME = "/WebContent/pages/greeting.xhtml";
+ private static final String PAGE_NAME = "/WebContent/pages/greeting1.xhtml";
- private static final String TAG_NAME = "ui:composition";
- private static final String ATTR_NAME = "template";
-
public static Test suite() {
return new TestSuite(JsfJspJbide2437Test.class);
}
@@ -36,108 +36,46 @@
}
protected void tearDown() throws Exception {
- if(provider != null) {
- provider.dispose();
- }
+ provider.dispose();
}
- public void testJsfJspJbide2437 () {
- try {
- JobUtils.waitForIdle();
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- assertTrue("Test project \"" + PROJECT_NAME + "\" is not loaded", (project != null));
-
+ public void testJsfJspJbide2437 () throws BadLocationException {
openEditor(PAGE_NAME);
+
+ ICompletionProposal[] result= null;
+ String errorMessage = null;
- IStructuredDocumentRegion[] regions = ((IStructuredDocument)document).getStructuredDocumentRegions();
+ IRegion reg = new FindReplaceDocumentAdapter(document).find(0, "/templates/common.xhtml", true, false, false, false);
- boolean fUiCompositionTagFound = false;
- for (int i = 0; i < regions.length && !fUiCompositionTagFound; i++) {
- IStructuredDocumentRegion sdRegion = regions[i];
- ITextRegionList list = sdRegion.getRegions();
-
- // find <ui:composition tag
- if (!fUiCompositionTagFound) {
- if (DOMRegionContext.XML_TAG_OPEN == list.get(0).getType() &&
- DOMRegionContext.XML_TAG_NAME == list.get(1).getType() &&
- TAG_NAME.equals(sdRegion.getFullText(list.get(1)).trim())) {
- fUiCompositionTagFound = true;
-
- // find TEMPLATE attribute of <ui:composition tag
- boolean fUiCompositionTemplateAttributeFound = false;
- for (int j = 2; j < list.size(); j++) {
- ITextRegion region = list.get(j);
- if (!fUiCompositionTemplateAttributeFound) {
- if (DOMRegionContext.XML_TAG_ATTRIBUTE_NAME == region.getType() &&
- ATTR_NAME.equalsIgnoreCase(sdRegion.getFullText(list.get(j)).trim())) {
- fUiCompositionTemplateAttributeFound = true;
- }
- continue;
- } else {
- if (DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE == region.getType()) {
- String valueText = sdRegion.getFullText(region);
- int openQuoteIndex = valueText == null ? 0 : valueText.indexOf('\"');
- if (openQuoteIndex == -1)
- openQuoteIndex = valueText == null ? 0 : valueText.indexOf('\'');
-
- assertFalse("There is no value defined for template attribute of tag ui:composition.", (openQuoteIndex == -1));
-
- int offsetToTest = sdRegion.getStartOffset(region) + openQuoteIndex + 1;
-
- ICompletionProposal[] result= null;
- String errorMessage = null;
-
- IContentAssistProcessor p= TestUtil.getProcessor(viewer, offsetToTest, contentAssistant);
- if (p != null) {
- try {
- result= p.computeCompletionProposals(viewer, offsetToTest);
- } catch (Throwable x) {
- x.printStackTrace();
- }
- errorMessage= p.getErrorMessage();
- }
-
- boolean bELProposalsFound = false;
- boolean bTemplatePathProposalsFound = false;
- for (int k = 0;
- result != null && k < result.length &&
- (!bELProposalsFound || !bTemplatePathProposalsFound); k++) {
- if (result[k] instanceof AutoContentAssistantProposal) {
- AutoContentAssistantProposal proposal = (AutoContentAssistantProposal)result[k];
-
- // Test the display string for the proposals - it has to shown the thmplate path beginning or EL-expression beginning
- // because the CA is started the calculation from the very beginning of the attribute value.
- String dispString = proposal.getDisplayString();
-
- assertFalse("The CA proposal returned NULL display string.", (dispString == null));
-
- if (dispString.startsWith("#{") || dispString.startsWith("${")) {
- bELProposalsFound = true;
- } else if (dispString.indexOf("/") != -1) {
- bTemplatePathProposalsFound = true;
- }
- }
- }
-
- // There should be proposals for template paths
- assertTrue("Content Assistant peturned no proposals for template paths.", bTemplatePathProposalsFound);
- // There should be proposals for EL-expresions
- assertTrue("Content Assistant peturned no proposals for template paths.", bELProposalsFound);
-
- break;
- }
- }
- }
-
+ IContentAssistProcessor p= TestUtil.getProcessor(viewer, reg.getOffset(), contentAssistant);
+ assertNotNull("Cannot obtain IContentAssistProcessor instance",p);
+ result= p.computeCompletionProposals(viewer, reg.getOffset());
+
+ boolean bELProposalsFound = false;
+ boolean bTemplatePathProposalsFound = false;
+ for (int k = 0; result != null && k < result.length &&
+ (!bELProposalsFound || !bTemplatePathProposalsFound); k++) {
+ if (result[k] instanceof AutoContentAssistantProposal) {
+ AutoContentAssistantProposal proposal = (AutoContentAssistantProposal)result[k];
+
+ // Test the display string for the proposals - it has to shown the thmplate path beginning or EL-expression beginning
+ // because the CA is started the calculation from the very beginning of the attribute value.
+ String dispString = proposal.getDisplayString();
+
+ assertFalse("The CA proposal returned NULL display string.", (dispString == null));
+
+ if (dispString.startsWith("#{") || dispString.startsWith("${")) {
+ bELProposalsFound = true;
+ } else if (dispString.indexOf("/") != -1) {
+ bTemplatePathProposalsFound = true;
}
- continue;
}
-
- break;
}
+
+ // There should be proposals for template paths
+ assertTrue("Content Assistant peturned no proposals for template paths.", bTemplatePathProposalsFound);
+ // There should be proposals for EL-expresions
+ assertTrue("Content Assistant peturned no proposals for template paths.", bELProposalsFound);
closeEditor();
}
17 years, 5 months
JBoss Tools SVN: r11602 - in trunk/esb/plugins/org.jboss.tools.esb.project.ui: icons/obj16 and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dennyxu
Date: 2008-11-07 00:18:30 -0500 (Fri, 07 Nov 2008)
New Revision: 11602
Added:
trunk/esb/plugins/org.jboss.tools.esb.project.ui/icons/obj16/esb_module_ovr.gif
trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/ESBProjectDecorator.java
Modified:
trunk/esb/plugins/org.jboss.tools.esb.project.ui/plugin.xml
Log:
JBIDE-3040:ESB projects does not have a module icon
Added: trunk/esb/plugins/org.jboss.tools.esb.project.ui/icons/obj16/esb_module_ovr.gif
===================================================================
(Binary files differ)
Property changes on: trunk/esb/plugins/org.jboss.tools.esb.project.ui/icons/obj16/esb_module_ovr.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.ui/plugin.xml
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.ui/plugin.xml 2008-11-07 03:17:54 UTC (rev 11601)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.ui/plugin.xml 2008-11-07 05:18:30 UTC (rev 11602)
@@ -39,4 +39,24 @@
typeIds="jst.jboss.esb">
</image>
</extension>
+ <!--extension
+ point="org.eclipse.ui.ide.projectNatureImages">
+ <image
+ icon="icons/obj16/esb_module_ovr.gif"
+ id="org.jboss.tools.esb.project.core.image"
+ natureId="org.jboss.tools.esb.project.core.ESBNature">
+ </image>
+ </extension-->
+ <extension
+ point="org.eclipse.ui.decorators">
+ <decorator
+ class="org.jboss.tools.esb.project.ui.ESBProjectDecorator"
+ icon="icons/obj16/esb_module_ovr.gif"
+ id="org.jboss.tools.esb.project.ui.decorator"
+ label="label"
+ lightweight="true"
+ location="TOP_LEFT"
+ state="false">
+ </decorator>
+ </extension>
</plugin>
Added: trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/ESBProjectDecorator.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/ESBProjectDecorator.java (rev 0)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/ESBProjectDecorator.java 2008-11-07 05:18:30 UTC (rev 11602)
@@ -0,0 +1,58 @@
+package org.jboss.tools.esb.project.ui;
+
+import java.net.URL;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.viewers.IDecoration;
+import org.eclipse.jface.viewers.ILightweightLabelDecorator;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.wst.common.project.facet.core.FacetedProjectFramework;
+import org.jboss.tools.esb.core.ESBProjectConstant;
+
+public class ESBProjectDecorator extends LabelProvider implements
+ ILightweightLabelDecorator {
+
+ public void decorate(Object element, IDecoration decoration) {
+ if(element instanceof IJavaProject) {
+ element = ((IJavaProject)element).getProject();
+ }
+ if (element instanceof IProject) {
+
+ IProject project = (IProject) element;
+ ImageDescriptor overlay = null;
+ if (hasFacet(project, ESBProjectConstant.ESB_PROJECT_FACET))
+ overlay=getESBImageDescriptor();
+
+ if(overlay != null){
+ decoration.addOverlay(overlay);
+ }
+ }
+
+ }
+
+ private boolean hasFacet(IProject project, String facet) {
+ try {
+ return FacetedProjectFramework.hasProjectFacet(project, facet);
+ } catch (CoreException e) {
+ return false;
+ }
+ }
+
+ private static ImageDescriptor getESBImageDescriptor() {
+ ImageDescriptor imageDescriptor = null;
+ IPath path = new Path("icons/obj16/esb_module_ovr.gif");
+ URL gifImageURL = FileLocator.find(Platform
+ .getBundle(ESBProjectPlugin.PLUGIN_ID), path, null);
+ if (gifImageURL != null)
+ imageDescriptor = ImageDescriptor.createFromURL(gifImageURL);
+ return imageDescriptor;
+ }
+
+}
17 years, 5 months
JBoss Tools SVN: r11601 - trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2008-11-06 22:17:54 -0500 (Thu, 06 Nov 2008)
New Revision: 11601
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java
Log:
JBIDE-2988
Throw several exceptions during analyzing java2java config file
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java 2008-11-07 01:10:51 UTC (rev 11600)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java 2008-11-07 03:17:54 UTC (rev 11601)
@@ -10,6 +10,7 @@
******************************************************************************/
package org.jboss.tools.smooks.javabean.analyzer;
+import java.awt.event.InvocationEvent;
import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import java.util.Collection;
@@ -81,7 +82,7 @@
public static final String SPACE_STRING = " "; //$NON-NLS-1$
public static final String COMPLEX_PRIX_START = "${"; //$NON-NLS-1$
-
+
public static final String COMPLEX_PRIX_END = "}"; //$NON-NLS-1$
private static final int TARGET_DATA = 1;
@@ -213,7 +214,8 @@
if (beanId == null)
beanId = targetJavaBean.getName();
if (beanId.startsWith(COMPLEX_PRIX_START)) {
- beanId = beanId.substring(2, beanId.indexOf(COMPLEX_PRIX_END));
+ beanId = beanId.substring(2, beanId
+ .indexOf(COMPLEX_PRIX_END));
}
SmooksModelUtils
.appendTextToSmooksType(beanIdParam, beanId);
@@ -308,7 +310,8 @@
if (sourcebean.getParent() == currentRootModel
.getReferenceEntityModel()) {
if (!currentbean.isPrimitive()) {
- return COMPLEX_PRIX_START + currentbean.getName() + COMPLEX_PRIX_END;
+ return COMPLEX_PRIX_START + currentbean.getName()
+ + COMPLEX_PRIX_END;
} else {
return rootbean.getBeanClassString() + SPACE_STRING
+ sourcebean.getName();
@@ -421,8 +424,10 @@
boolean connectAuto = MessageDialog
.openQuestion(
displayParent,
- Messages.getString("JavaBeanAnalyzer.ConnectionQuestion"), //$NON-NLS-1$
- Messages.getString("JavaBeanAnalyzer.ConnectRootQuestion")); //$NON-NLS-1$
+ Messages
+ .getString("JavaBeanAnalyzer.ConnectionQuestion"), //$NON-NLS-1$
+ Messages
+ .getString("JavaBeanAnalyzer.ConnectRootQuestion")); //$NON-NLS-1$
if (connectAuto) {
// connect root model
LineConnectionModel connectionModel = new LineConnectionModel();
@@ -469,7 +474,9 @@
}
if (!(sourceObject instanceof JavaBeanModel)
|| !(targetObject instanceof JavaBeanModel)) {
- return MappingResourceConfigList.createEmptyList();
+ throw new RuntimeException(
+ "Can't load the source/target data from Smooks configuration file.");
+ // return MappingResourceConfigList.createEmptyList();
}
MappingResourceConfigList resourceConfigList = new MappingResourceConfigList();
JavaBeanModel source = (JavaBeanModel) sourceObject;
@@ -513,7 +520,8 @@
}
protected boolean isReferenceSelector(String selector) {
- return (selector.startsWith(COMPLEX_PRIX_START) && selector.endsWith(COMPLEX_PRIX_END));
+ return (selector.startsWith(COMPLEX_PRIX_START) && selector
+ .endsWith(COMPLEX_PRIX_END));
}
protected String getBeanIdWithRawSelectorString(String selector) {
@@ -537,11 +545,16 @@
binding, SmooksModelUtils.ATTRIBUTE_PROPERTY);
String selector = SmooksModelUtils.getAttributeValueFromAnyType(
binding, SmooksModelUtils.ATTRIBUTE_SELECTOR);
- JavaBeanModel targetModel = findTheChildJavaBeanModel(property,
- target);
+ JavaBeanModel childTargetModel = findTheChildJavaBeanModel(
+ property, target);
JavaBeanModel sourceModel = null;
- if (targetModel == null)
- continue;
+ if (childTargetModel == null) {
+ // TODO if can't find the child node , throw exception
+ // MODIFY by Dart 2008.11.07
+ throw new RuntimeException("There isn't any child property named \""
+ + property + "\" of \"" + target.getName()
+ + "\" JavaBean model");
+ }
if (isReferenceSelector(selector)) {
ResourceConfigType rc = this
.findResourceConfigTypeWithSelector(selector,
@@ -554,14 +567,15 @@
mappingResourceConfigList.addResourceConfig(rc);
analyzeMappingModelFromResourceConfig(mappingModelList,
mappingResourceConfigList, resourceList, rc,
- sourceModel, targetModel);
+ sourceModel, childTargetModel);
}
}
} else {
sourceModel = findModelWithSelectorString(selector, source);
}
if (sourceModel != null) {
- MappingModel model = new MappingModel(sourceModel, targetModel);
+ MappingModel model = new MappingModel(sourceModel,
+ childTargetModel);
UIUtils.assignBindingPropertyToMappingModel(binding, model,
new Object[] { SmooksModelUtils.ATTRIBUTE_PROPERTY,
SmooksModelUtils.ATTRIBUTE_SELECTOR });
@@ -573,19 +587,29 @@
protected JavaBeanModel findModelWithSelectorString(String selector,
JavaBeanModel parentModel) {
String[] s = selector.trim().split(SPACE_STRING);
- String pname = parentModel.getName();
+ String parentName = parentModel.getName();
Class clazz = parentModel.getBeanClass();
JavaBeanModel current = parentModel;
- if (clazz != null)
- pname = clazz.getName();
+ if (clazz != null){
+ parentName = clazz.getName();
+ }else{
+ // TODO if can't find the class, throw exception
+ // MODIFY by Dart 08.11.07
+ throw new RuntimeException("JavaBean \"" + parentModel.getName()+ "\" can't load its class.");
+ }
if (s != null) {
for (int i = 0; i < s.length; i++) {
- String p = s[i];
- if (p.equals(pname))
+ String childName = s[i];
+ if (childName.equals(parentName))
continue;
- JavaBeanModel child = findTheChildJavaBeanModel(p, current);
- if (child == null)
- return null;
+ JavaBeanModel child = findTheChildJavaBeanModel(childName, current);
+ if (child == null){
+ // TODO if can't find the child node , throw exception
+ // MODIFY by Dart 2008.11.07
+ throw new RuntimeException("There isn't any child property named \""
+ + childName + "\" of \"" + parentModel.getName()
+ + "\" JavaBean model");
+ }
current = child;
}
return current;
@@ -664,7 +688,9 @@
} else {
model = new JavaBeanModel(null, rootClassName);
model.setRootClassModel(true);
- model.setError(Messages.getString("JavaBeanAnalyzer.ClassNotExist") + rootClassName); //$NON-NLS-1$
+ model
+ .setError(Messages
+ .getString("JavaBeanAnalyzer.ClassNotExist") + rootClassName); //$NON-NLS-1$
model.setProperties(new ArrayList());
isError = true;
}
@@ -888,7 +914,8 @@
protected void analyzeBindingSelector(String selector,
JavaBeanModel currentModel, SmooksResourceListType listType,
ClassLoader classLoader) {
- if (selector.startsWith(COMPLEX_PRIX_START) && selector.endsWith(COMPLEX_PRIX_END)) {
+ if (selector.startsWith(COMPLEX_PRIX_START)
+ && selector.endsWith(COMPLEX_PRIX_END)) {
// should get the bean properties
// memory out???
currentModel.getProperties();
@@ -914,7 +941,8 @@
// something wrong
if (model == null) {
model = new JavaBeanModel(null, referenceSelector);
- model.setError(Messages.getString("JavaBeanAnalyzer.DontExist")); //$NON-NLS-1$
+ model.setError(Messages
+ .getString("JavaBeanAnalyzer.DontExist")); //$NON-NLS-1$
model.setProperties(new ArrayList());
setCollectionsInstanceClassName(model, resourceConfig);
}
@@ -943,7 +971,8 @@
} else {
pm = new JavaBeanModel(null, property);
pm.setProperties(new ArrayList());
- pm.setError(Messages.getString("JavaBeanAnalyzer.DontExist")); //$NON-NLS-1$
+ pm.setError(Messages
+ .getString("JavaBeanAnalyzer.DontExist")); //$NON-NLS-1$
currentParent.addProperty(pm);
}
currentParent = pm;
17 years, 5 months
JBoss Tools SVN: r11600 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-11-06 20:10:51 -0500 (Thu, 06 Nov 2008)
New Revision: 11600
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/AbstractJBossLaunchConfigType.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/JBossServerStartupLaunchConfiguration.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/StopLaunchConfiguration.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/TwiddleLaunchConfiguration.java
Log:
JBIDE-2742 - adding tools.jar (if it exists) to jboss launches version 4.0.x
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/AbstractJBossLaunchConfigType.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/AbstractJBossLaunchConfigType.java 2008-11-07 00:59:41 UTC (rev 11599)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/AbstractJBossLaunchConfigType.java 2008-11-07 01:10:51 UTC (rev 11600)
@@ -7,6 +7,7 @@
import java.util.Map;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
@@ -148,22 +149,18 @@
}
protected static void addCPEntry(ArrayList<IRuntimeClasspathEntry> list, JBossServer jbs, String relative) {
- list.add(JavaRuntime.newArchiveRuntimeClasspathEntry(new Path(getServerHome(jbs)).append(relative)));
+ addCPEntry(list, new Path(getServerHome(jbs)).append(relative));
}
+ protected static void addCPEntry(ArrayList<IRuntimeClasspathEntry> list, IPath path) {
+ list.add(JavaRuntime.newArchiveRuntimeClasspathEntry(path));
+ }
- @Deprecated
- protected static ArrayList<String> convertClasspath(ArrayList<IRuntimeClasspathEntry> cp, IVMInstall vmInstall) {
- addJREEntry(cp, vmInstall);
- return convertClasspath(cp);
- }
-
protected static void addJREEntry(ArrayList<IRuntimeClasspathEntry> cp, IVMInstall vmInstall) {
if (vmInstall != null) {
try {
cp.add(JavaRuntime.newRuntimeContainerClasspathEntry(
new Path(JavaRuntime.JRE_CONTAINER)
.append(vmInstall.getVMInstallType().getId()).append(vmInstall.getName()),
-// "org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType")
IRuntimeClasspathEntry.BOOTSTRAP_CLASSES));
} catch (CoreException e) {
IStatus s = new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID,
@@ -173,6 +170,15 @@
}
}
+ protected static void addToolsJar(ArrayList<IRuntimeClasspathEntry> cp, IVMInstall vmInstall) {
+ File f = vmInstall.getInstallLocation();
+ File c1 = new File(f, "lib");
+ File c2 = new File(c1, "tools.jar");
+ if( c2.exists())
+ addCPEntry(cp, new Path(c2.getAbsolutePath()));
+ }
+
+
protected static ArrayList<String> convertClasspath(ArrayList<IRuntimeClasspathEntry> cp) {
Iterator<IRuntimeClasspathEntry> cpi = cp.iterator();
ArrayList<String> list = new ArrayList<String>();
@@ -206,7 +212,7 @@
classpath.add(JavaRuntime.newArchiveRuntimeClasspathEntry(new Path(
libPath + File.separator + libs[i].getName())));
}
- } // end method
+ }
public static String getServerHome(JBossServer jbs) {
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/JBossServerStartupLaunchConfiguration.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/JBossServerStartupLaunchConfiguration.java 2008-11-07 00:59:41 UTC (rev 11599)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/JBossServerStartupLaunchConfiguration.java 2008-11-07 01:10:51 UTC (rev 11600)
@@ -22,7 +22,6 @@
package org.jboss.ide.eclipse.as.core.server.internal.launch;
import java.util.ArrayList;
-import java.util.HashMap;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
@@ -41,7 +40,6 @@
import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
import org.eclipse.jdt.launching.IVMInstall;
import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jdt.launching.StandardClasspathProvider;
import org.eclipse.wst.server.core.IRuntime;
import org.eclipse.wst.server.core.IServer;
import org.eclipse.wst.server.core.ServerUtil;
@@ -83,49 +81,53 @@
IRuntime rt = jbs.getServer().getRuntime();
String jrePath = null;
+ IJBossServerRuntime jbrt = null;
if( rt != null ) {
- IJBossServerRuntime jbrt = (IJBossServerRuntime)rt.getAdapter(IJBossServerRuntime.class);
- if( jbrt != null ) {
- IVMInstall install = jbrt.getVM();
- IPath path = JavaRuntime.newJREContainerPath(install);
- jrePath = path.toPortableString();
- }
+ jbrt = (IJBossServerRuntime)rt.getAdapter(IJBossServerRuntime.class);
}
+ if( jbrt == null )
+ throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, "Runtime not found"));
+
+ IVMInstall install = jbrt.getVM();
+ IPath path = JavaRuntime.newJREContainerPath(install);
+ jrePath = path.toPortableString();
+
wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, getDefaultArgs(jbs));
- wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS, getDefaultVMArgs(jbs));
+ wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS, jbrt.getDefaultRunVMArgs());
wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME, START_MAIN_TYPE);
wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY, serverHome + Path.SEPARATOR + "bin");
- wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_CLASSPATH_PROVIDER, "org.jboss.ide.eclipse.as.core.launch.classpathProvider");
wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_JRE_CONTAINER_PATH, jrePath);
- wc.setAttribute(ILaunchManager.ATTR_ENVIRONMENT_VARIABLES, getDefaultEnvVars(jbs));
+ wc.setAttribute(ILaunchManager.ATTR_ENVIRONMENT_VARIABLES, jbrt.getDefaultRunEnvVars());
+ wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_CLASSPATH, getClasspath(jbs));
+ wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_DEFAULT_CLASSPATH, false);
+
wc.setAttribute(DEFAULTS_SET, true);
}
+ public static ArrayList<String> getClasspath(JBossServer jbs) throws CoreException {
+ IJBossServerRuntime jbrt = findJBossServerRuntime(jbs.getServer());
+ ArrayList<IRuntimeClasspathEntry> classpath = new ArrayList<IRuntimeClasspathEntry>();
+ addCPEntry(classpath, jbs, START_JAR_LOC);
+ addJREEntry(classpath, jbrt.getVM());
+
+ String version = jbs.getServer().getRuntime().getRuntimeType().getVersion();
+ if( version.equals("4.0"))
+ addToolsJar(classpath, jbrt.getVM());
+
+ ArrayList<String> runtimeClassPaths = convertClasspath(classpath);
+ return runtimeClassPaths;
+
+ }
+
public static String getDefaultArgs(JBossServer jbs) throws CoreException {
IJBossServerRuntime rt = findJBossServerRuntime(jbs.getServer());
if (rt != null) {
return rt.getDefaultRunArgs() + " -b " + jbs.getServer().getHost();
}
- throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, "Runtime not found"));
+ return null;
}
-
- public static String getDefaultVMArgs(JBossServer jbs) throws CoreException {
- IJBossServerRuntime rt = findJBossServerRuntime(jbs.getServer());
- if (rt != null) {
- return rt.getDefaultRunVMArgs();
- }
- throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, "Runtime not found"));
- }
- public static HashMap<String, String> getDefaultEnvVars(JBossServer jbs) throws CoreException {
- IJBossServerRuntime rt = findJBossServerRuntime(jbs.getServer());
- if (rt != null) {
- return rt.getDefaultRunEnvVars();
- }
- throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, "Runtime not found"));
- }
-
protected void preLaunch(ILaunchConfiguration configuration,
String mode, ILaunch launch, IProgressMonitor monitor) {
try {
@@ -201,31 +203,5 @@
ILaunchConfigurationWorkingCopy wc = launchConfigType.newInstance(null, launchName);
wc.setAttribute(SERVER_ID, server.getId());
return wc;
- }
-
-
- public static class StartupClasspathProvider extends StandardClasspathProvider {
-
- public IRuntimeClasspathEntry[] computeUnresolvedClasspath(ILaunchConfiguration configuration) throws CoreException {
- boolean useDefault = configuration.getAttribute(IJavaLaunchConfigurationConstants.ATTR_DEFAULT_CLASSPATH, true);
- if (useDefault) {
- return computeUnresolvedDefaultClasspath(configuration);
- }
- // recover persisted classpath
- return recoverRuntimePath(configuration, IJavaLaunchConfigurationConstants.ATTR_CLASSPATH);
- }
-
- protected IRuntimeClasspathEntry[] computeUnresolvedDefaultClasspath(ILaunchConfiguration configuration) throws CoreException {
- String serverId = configuration.getAttribute(SERVER_ID, (String)null);
- JBossServer jbs = findJBossServer(serverId);
- IJBossServerRuntime jbrt = findJBossServerRuntime(jbs.getServer());
- ArrayList<IRuntimeClasspathEntry> classpath = new ArrayList<IRuntimeClasspathEntry>();
- addCPEntry(classpath, jbs, START_JAR_LOC);
- addJREEntry(classpath, jbrt.getVM());
- return (IRuntimeClasspathEntry[]) classpath
- .toArray(new IRuntimeClasspathEntry[classpath.size()]);
- }
-
- }
-
+ }
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/StopLaunchConfiguration.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/StopLaunchConfiguration.java 2008-11-07 00:59:41 UTC (rev 11599)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/StopLaunchConfiguration.java 2008-11-07 01:10:51 UTC (rev 11600)
@@ -90,7 +90,8 @@
wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY, serverHome + Path.SEPARATOR + "bin");
ArrayList<IRuntimeClasspathEntry> classpath = new ArrayList<IRuntimeClasspathEntry>();
addCPEntry(classpath, jbs, STOP_JAR_LOC);
- ArrayList runtimeClassPaths = convertClasspath(classpath, jbrt.getVM());
+ addJREEntry(classpath, jbrt.getVM());
+ ArrayList<String> runtimeClassPaths = convertClasspath(classpath);
String cpKey = IJavaLaunchConfigurationConstants.ATTR_CLASSPATH;
wc.setAttribute(cpKey, runtimeClassPaths);
wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_DEFAULT_CLASSPATH, false);
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/TwiddleLaunchConfiguration.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/TwiddleLaunchConfiguration.java 2008-11-07 00:59:41 UTC (rev 11599)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/TwiddleLaunchConfiguration.java 2008-11-07 01:10:51 UTC (rev 11600)
@@ -31,6 +31,7 @@
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
import org.eclipse.debug.core.ILaunchManager;
import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
+import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
import org.eclipse.wst.server.core.IServer;
import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
@@ -62,13 +63,14 @@
wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY, serverHome + Path.SEPARATOR + "bin");
wc.setAttribute(TwiddleLaunchConfiguration.SERVER_ID, server.getId());
- ArrayList classpath = new ArrayList();
+ ArrayList<IRuntimeClasspathEntry> classpath = new ArrayList<IRuntimeClasspathEntry>();
addCPEntry(classpath, jbs, TWIDDLE_JAR_LOC);
// Twiddle requires more classes and I'm too lazy to actually figure OUT which ones it needs.
addDirectory (serverHome, classpath, "lib");
addDirectory (serverHome, classpath, "lib" + File.separator + "endorsed");
addDirectory (serverHome, classpath, "client");
- ArrayList runtimeClassPaths = convertClasspath(classpath, jbrt.getVM());
+ addJREEntry(classpath, jbrt.getVM());
+ ArrayList<String> runtimeClassPaths = convertClasspath(classpath);
String cpKey = IJavaLaunchConfigurationConstants.ATTR_CLASSPATH;
wc.setAttribute(cpKey, runtimeClassPaths);
wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_DEFAULT_CLASSPATH, false);
17 years, 5 months
JBoss Tools SVN: r11599 - in trunk/jst/tests/org.jboss.tools.jst.jsp.test: src/org/jboss/tools/jst/jsp/test and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-11-06 19:59:41 -0500 (Thu, 06 Nov 2008)
New Revision: 11599
Added:
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/WebContent/WEB-INF/lib/jsf-api.jar
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/WebContent/WEB-INF/lib/jsf-impl.jar
Removed:
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/WebContent/WEB-INF/lib/jsf-tlds.jar
Modified:
trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/JstJspAllTests.java
trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1704Test.java
Log:
fix build hanging for CA tests
Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/WebContent/WEB-INF/lib/jsf-api.jar
===================================================================
(Binary files differ)
Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/WebContent/WEB-INF/lib/jsf-api.jar
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/WebContent/WEB-INF/lib/jsf-impl.jar
===================================================================
(Binary files differ)
Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/WebContent/WEB-INF/lib/jsf-impl.jar
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/WebContent/WEB-INF/lib/jsf-tlds.jar
===================================================================
(Binary files differ)
Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/JstJspAllTests.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/JstJspAllTests.java 2008-11-06 21:42:40 UTC (rev 11598)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/JstJspAllTests.java 2008-11-07 00:59:41 UTC (rev 11599)
@@ -24,11 +24,11 @@
suite.addTestSuite(JstJspJbide1585Test.class);
suite.addTestSuite(StrutsJspJbide1648Test.class);
suite.addTestSuite(JstJspJbide1641Test.class);
- //suite.addTestSuite(JsfJspJbide1704Test.class);
+ suite.addTestSuite(JsfJspJbide1704Test.class);
suite.addTestSuite(JsfJspJbide1717Test.class);
suite.addTestSuite(JstJspJbide1759Test.class);
suite.addTestSuite(Jbide1791Test.class);
- //suite.addTestSuite(JsfJspJbide2437Test.class);
+ suite.addTestSuite(JsfJspJbide2437Test.class);
return suite;
}
Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1704Test.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1704Test.java 2008-11-06 21:42:40 UTC (rev 11598)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1704Test.java 2008-11-07 00:59:41 UTC (rev 11599)
@@ -4,8 +4,12 @@
import junit.framework.TestSuite;
import org.eclipse.core.resources.IResource;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.FindReplaceDocumentAdapter;
+import org.eclipse.jface.text.IRegion;
import org.eclipse.jface.text.contentassist.ICompletionProposal;
import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
+import org.eclipse.swt.widgets.Display;
import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
@@ -22,10 +26,7 @@
boolean makeCopy = false;
private static final String PROJECT_NAME = "JsfJbide1704Test";
private static final String PAGE_NAME = "/WebContent/pages/greeting";
- private static final String[] PAGE_EXTENSIONS = { ".xhtml", ".jsp" };
- private static final String PREFIX_TAG_NAME = "f:loadBundle";
-
public static Test suite() {
return new TestSuite(JsfJspJbide1704Test.class);
}
@@ -41,74 +42,38 @@
}
}
- public void testJsfJspJbide1704 () {
- try {
- JobUtils.waitForIdle();
- } catch (Exception e) {
- e.printStackTrace();
- }
-
+ public void testJspJbide1704 () {
assertTrue("Test project \"" + PROJECT_NAME + "\" is not loaded", (project != null));
-
- for (int i = 0; i < PAGE_EXTENSIONS.length; i++) {
- doTestJsfJspJbide1704(PAGE_NAME + PAGE_EXTENSIONS[i]);
- }
+ doTestJsfJspJbide1704(PAGE_NAME + ".jsp");
}
+ public void testXhtmlJbide1704 () {
+ assertTrue("Test project \"" + PROJECT_NAME + "\" is not loaded", (project != null));
+ doTestJsfJspJbide1704(PAGE_NAME + ".xhtml");
+ }
+
private void doTestJsfJspJbide1704(String pageName) {
openEditor(pageName);
- IStructuredDocumentRegion[] regions = ((IStructuredDocument)document).getStructuredDocumentRegions();
-
- boolean fLoadBundleTagIsFound = false;
- for (int i = 0; i < regions.length; i++) {
- IStructuredDocumentRegion sdRegion = regions[i];
- ITextRegionList list = sdRegion.getRegions();
-
- // find <f:loadBundle tag first (after this tag the CA is full of JSF- and other kind of proposals
- if (!fLoadBundleTagIsFound) {
- if (DOMRegionContext.XML_TAG_OPEN == list.get(0).getType() &&
- DOMRegionContext.XML_TAG_NAME == list.get(1).getType() &&
- PREFIX_TAG_NAME.equals(sdRegion.getFullText(list.get(1)).trim())) {
- fLoadBundleTagIsFound = true;
- }
- continue;
- }
+ try {
- //
- if (DOMRegionContext.XML_TAG_OPEN == list.get(0).getType() &&
- DOMRegionContext.XML_TAG_NAME == list.get(1).getType()) {
- // find all the attribute values and their "after closing quotes" offsets
-
- for (int j = 2; j < list.size(); j++) {
- ITextRegion region = list.get(j);
- if (DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE == region.getType()) {
- int length = sdRegion.getFullText(region).trim().length();
- int offsetToTest = sdRegion.getStartOffset(region) + length;
-
- ICompletionProposal[] result= null;
- String errorMessage = null;
+ ICompletionProposal[] result= null;
+ final IRegion reg = new FindReplaceDocumentAdapter(document).find(0,
+ " var=\"msg\"", true, true, false, false);
+ String errorMessage = null;
- IContentAssistProcessor p= TestUtil.getProcessor(viewer, offsetToTest, contentAssistant);
- if (p != null) {
- try {
- result= p.computeCompletionProposals(viewer, offsetToTest);
- } catch (Throwable x) {
- x.printStackTrace();
- }
- errorMessage= p.getErrorMessage();
- }
-
- for (int k = 0; result != null && k < result.length; k++) {
- // There should not be a proposal of type Red.Proposal in the result
- assertFalse("Content Assistant peturned proposals of type (" + result[k].getClass().getName() + ").", (result[k] instanceof AutoContentAssistantProposal));
- }
- }
- }
-
+ final IContentAssistProcessor p= TestUtil.getProcessor(viewer, reg.getOffset(), contentAssistant);
+ if (p != null) {
+ result= p.computeCompletionProposals(viewer, reg.getOffset());
}
-
+ for (int k = 0; result != null && k < result.length; k++) {
+ // There should not be a proposal of type Red.Proposal in the result
+ assertFalse("Content Assistant peturned proposals of type (" + result[k].getClass().getName() + ").", (result[k] instanceof AutoContentAssistantProposal));
+ }
+
+ } catch (BadLocationException e) {
+ fail(e.getMessage());
}
closeEditor();
17 years, 5 months
JBoss Tools SVN: r11598 - in trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core: util and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-11-06 16:42:40 -0500 (Thu, 06 Nov 2008)
New Revision: 11598
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServer.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ModuleUtil.java
Log:
Moving some common / reusable code into a utility class.
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServer.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServer.java 2008-11-06 20:51:30 UTC (rev 11597)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServer.java 2008-11-06 21:42:40 UTC (rev 11598)
@@ -42,6 +42,7 @@
import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
+import org.jboss.ide.eclipse.as.core.util.ModuleUtil;
public class DeployableServer extends ServerDelegate implements IDeployableServer {
@@ -71,28 +72,8 @@
}
public IModule[] getChildModules(IModule[] module) {
- int last = module.length-1;
- if (module[last] != null && module[last].getModuleType() != null) {
- IModuleType moduleType = module[last].getModuleType();
- if("jst.ear".equals(moduleType.getId())) { //$NON-NLS-1$
- IEnterpriseApplication enterpriseApplication = (IEnterpriseApplication) module[0]
- .loadAdapter(IEnterpriseApplication.class, null);
- if (enterpriseApplication != null) {
- IModule[] earModules = enterpriseApplication.getModules();
- if ( earModules != null) {
- return earModules;
- }
- }
- }
- else if ("jst.web".equals(moduleType.getId())) { //$NON-NLS-1$
- IWebModule webModule = (IWebModule) module[last].loadAdapter(IWebModule.class, null);
- if (webModule != null) {
- IModule[] modules = webModule.getModules();
- return modules;
- }
- }
- }
- return new IModule[0];
+ IModule[] children = ModuleUtil.getChildModules(module);
+ return children;
}
public IModule[] getRootModules(IModule module) throws CoreException {
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ModuleUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ModuleUtil.java 2008-11-06 20:51:30 UTC (rev 11597)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ModuleUtil.java 2008-11-06 21:42:40 UTC (rev 11598)
@@ -4,8 +4,12 @@
import java.util.Arrays;
import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.jst.server.core.IEnterpriseApplication;
+import org.eclipse.jst.server.core.IWebModule;
import org.eclipse.wst.server.core.IModule;
+import org.eclipse.wst.server.core.IModuleType;
import org.eclipse.wst.server.core.IServer;
+import org.eclipse.wst.server.core.model.ModuleDelegate;
public class ModuleUtil {
public static ArrayList<IModule[]> getShallowChildren(IServer server, IModule[] root) {
@@ -32,4 +36,30 @@
}
return deep;
}
+
+ public static IModule[] getChildModules(IModule[] module) {
+ int last = module.length-1;
+ if (module[last] != null && module[last].getModuleType() != null) {
+ IModuleType moduleType = module[last].getModuleType();
+ if("jst.ear".equals(moduleType.getId())) { //$NON-NLS-1$
+ IEnterpriseApplication enterpriseApplication = (IEnterpriseApplication) module[0]
+ .loadAdapter(IEnterpriseApplication.class, null);
+ if (enterpriseApplication != null) {
+ IModule[] earModules = enterpriseApplication.getModules();
+ if ( earModules != null) {
+ return earModules;
+ }
+ }
+ }
+ else if ("jst.web".equals(moduleType.getId())) { //$NON-NLS-1$
+ IWebModule webModule = (IWebModule) module[last].loadAdapter(IWebModule.class, null);
+ if (webModule != null) {
+ IModule[] modules = webModule.getModules();
+ return modules;
+ }
+ }
+ }
+ return new IModule[0];
+ }
+
}
17 years, 5 months