JBoss Tools SVN: r2939 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2007-08-07 12:35:13 -0400 (Tue, 07 Aug 2007)
New Revision: 2939
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-670 xhtml code completion does not update it's list of completions
Seam context usage is fixed
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java 2007-08-07 16:29:22 UTC (rev 2938)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java 2007-08-07 16:35:13 UTC (rev 2939)
@@ -308,6 +308,8 @@
if (project == null || resource == null)
return null;
+ if (!"java".equals(resource.getFileExtension()))
+ return null;
Set<ISeamComponent> components = project.getComponentsByPath(resource.getFullPath());
if (components.size() > 1) // Don't use scope in case of more than one component
18 years, 4 months
JBoss Tools SVN: r2938 - in trunk/seam/plugins/org.jboss.tools.seam.core: src/org/jboss/tools/seam/internal/core/el and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-08-07 12:29:22 -0400 (Tue, 07 Aug 2007)
New Revision: 2938
Added:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamPromptingProvider.java
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml
Log:
JBIDE-672
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml 2007-08-07 16:26:42 UTC (rev 2937)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml 2007-08-07 16:29:22 UTC (rev 2938)
@@ -201,4 +201,9 @@
</persistent>
</extension>
+ <extension point="org.jboss.tools.common.model.classes">
+ <xclass id="org.jboss.tools.seam.internal.core.el.SeamPromptingProvider"
+ class="org.jboss.tools.seam.internal.core.el.SeamPromptingProvider"/>
+ </extension>
+
</plugin>
Added: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamPromptingProvider.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamPromptingProvider.java (rev 0)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamPromptingProvider.java 2007-08-07 16:29:22 UTC (rev 2938)
@@ -0,0 +1,52 @@
+package org.jboss.tools.seam.internal.core.el;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
+import java.util.Set;
+import java.util.TreeSet;
+
+import org.eclipse.core.resources.IFile;
+import org.jboss.tools.common.model.XModel;
+import org.jboss.tools.common.model.project.IPromptingProvider;
+import org.jboss.tools.seam.core.ISeamContextVariable;
+import org.jboss.tools.seam.core.ISeamProject;
+import org.jboss.tools.seam.core.SeamCorePlugin;
+
+public class SeamPromptingProvider implements IPromptingProvider {
+ static String IS_SEAM_PROJECT = "seam.is_seam_project";
+ static String VARIABLES = "seam.variables";
+ static String MEMBERS = "seam.members";
+
+ public SeamPromptingProvider() {}
+
+ public List getList(XModel model, String id, String prefix,
+ Properties properties) {
+ IFile f = (IFile)properties.get("file");
+ ISeamProject p = (f == null) ? null : SeamCorePlugin.getSeamProject(f.getProject(), false);
+ if(p == null) return null;
+ if(IS_SEAM_PROJECT.equals(id)) {
+ ArrayList<Object> list = new ArrayList<Object>();
+ list.add(p);
+ return list;
+ } else if(VARIABLES.equals(id)) {
+ p.resolve();
+ Set<ISeamContextVariable> vs = p.getVariables();
+ Set<Object> set = new TreeSet<Object>();
+ for (ISeamContextVariable v : vs) {
+ set.add(v.getName());
+ }
+ ArrayList<Object> list = new ArrayList<Object>();
+ list.addAll(set);
+ return list;
+ } else if(MEMBERS.equals(id)) {
+
+ }
+ return null;
+ }
+
+ public boolean isSupporting(String id) {
+ return id != null && id.startsWith("seam.");
+ }
+
+}
18 years, 4 months
JBoss Tools SVN: r2937 - in trunk/common/plugins/org.jboss.tools.common.model/images: seam and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-08-07 12:26:42 -0400 (Tue, 07 Aug 2007)
New Revision: 2937
Added:
trunk/common/plugins/org.jboss.tools.common.model/images/seam/
trunk/common/plugins/org.jboss.tools.common.model/images/seam/variable.gif
trunk/common/plugins/org.jboss.tools.common.model/images/seam/variables_folder.gif
Log:
JBIDE-672
Added: trunk/common/plugins/org.jboss.tools.common.model/images/seam/variable.gif
===================================================================
(Binary files differ)
Property changes on: trunk/common/plugins/org.jboss.tools.common.model/images/seam/variable.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/common/plugins/org.jboss.tools.common.model/images/seam/variables_folder.gif
===================================================================
(Binary files differ)
Property changes on: trunk/common/plugins/org.jboss.tools.common.model/images/seam/variables_folder.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
18 years, 4 months
JBoss Tools SVN: r2936 - in trunk/hibernatetools/plugins: org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2007-08-07 12:24:07 -0400 (Tue, 07 Aug 2007)
New Revision: 2936
Added:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/HibernateUtils.java
Removed:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/TextUtil.java
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/OrmDiagram.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/DiagramEditPart.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmModelImageVisitor.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmModelNameVisitor.java
Log:
http://jira.jboss.com/jira/browse/EXIN-427
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/OrmDiagram.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/OrmDiagram.java 2007-08-07 14:56:35 UTC (rev 2935)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/OrmDiagram.java 2007-08-07 16:24:07 UTC (rev 2936)
@@ -48,7 +48,7 @@
import org.hibernate.type.Type;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.hibernate.ui.veditor.VisualEditorPlugin;
-import org.jboss.tools.hibernate.ui.view.views.TextUtil;
+import org.jboss.tools.hibernate.ui.view.views.HibernateUtils;
public class OrmDiagram extends ModelElement {
@@ -127,7 +127,7 @@
if (ormElement instanceof RootClass) {
childrenLocations[i] = ((RootClass)ormElement).getEntityName() + "@";
} else if (ormElement instanceof Table) {
- childrenLocations[i] = TextUtil.getTableName((Table)ormElement)+"@";
+ childrenLocations[i] = HibernateUtils.getTableName((Table)ormElement)+"@";
// } else if (ormElement instanceof Component) {
// childrenLocations[i] = ((Component)ormElement).getComponentClassName()+"@";
}
@@ -144,7 +144,7 @@
} else if (ormElement instanceof Table) {
ormShape = new OrmShape(ormElement);
getChildren().add(ormShape);
- elements.put(TextUtil.getTableName((Table)ormElement), ormShape);
+ elements.put(HibernateUtils.getTableName((Table)ormElement), ormShape);
} else if (ormElement instanceof Property) {
SpecialRootClass specialRootClass = new SpecialRootClass((Property)ormElement);
ormShape = new SpecialOrmShape(specialRootClass);
@@ -163,7 +163,7 @@
if (ormElement instanceof RootClass) {
ormShape = elements.get(((RootClass)ormElement).getEntityName());
} else if (ormElement instanceof Table) {
- ormShape = elements.get(TextUtil.getTableName((Table)ormElement));
+ ormShape = elements.get(HibernateUtils.getTableName((Table)ormElement));
} else if (ormElement instanceof Property) {
SpecialRootClass specialRootClass = new SpecialRootClass((Property)ormElement);
ormShape = elements.get(specialRootClass.getEntityName());
@@ -183,7 +183,7 @@
if(componentClassDatabaseTable == null && persistentClass.getTable() != null)
componentClassDatabaseTable = persistentClass.getTable();
if(componentClassDatabaseTable != null) {
- shape = elements.get(TextUtil.getTableName(componentClassDatabaseTable));
+ shape = elements.get(HibernateUtils.getTableName(componentClassDatabaseTable));
if (shape == null) shape = getOrCreateDatabaseTable(componentClassDatabaseTable);
createConnections(classShape, shape);
if(!isConnectionExist(classShape, shape)){
@@ -278,7 +278,7 @@
private OrmShape getOrCreateDatabaseTable(Table databaseTable){
OrmShape tableShape = null;
if(databaseTable != null) {
- String tableName = TextUtil.getTableName(databaseTable);
+ String tableName = HibernateUtils.getTableName(databaseTable);
tableShape = (OrmShape)elements.get(tableName);
if(tableShape == null) {
tableShape = createShape(databaseTable);
@@ -494,7 +494,7 @@
Component component = (Component)((Collection)property.getValue()).getElement();
if (component != null) {
classShape = createShape(property);
- OrmShape tableShape = (OrmShape)elements.get(TextUtil.getTableName(component.getTable()));
+ OrmShape tableShape = (OrmShape)elements.get(HibernateUtils.getTableName(component.getTable()));
if (tableShape == null) tableShape = getOrCreateDatabaseTable(component.getTable());
createConnections(classShape, tableShape);
if(!isConnectionExist(classShape, tableShape)){
@@ -527,7 +527,7 @@
// classShape = (OrmShape)elements.get(component.getAssociatedClass().getEntityName());
classShape = getOrCreatePersistentClass(component.getAssociatedClass(), null);
if (classShape == null) classShape = createShape(component.getAssociatedClass());
- OrmShape tableShape = (OrmShape)elements.get(TextUtil.getTableName(component.getAssociatedClass().getTable()));
+ OrmShape tableShape = (OrmShape)elements.get(HibernateUtils.getTableName(component.getAssociatedClass().getTable()));
if (tableShape == null) tableShape = getOrCreateDatabaseTable(component.getAssociatedClass().getTable());
createConnections(classShape, tableShape);
if(!isConnectionExist(classShape, tableShape)){
@@ -547,7 +547,7 @@
if (element instanceof RootClass) {
key = ((RootClass)element).getEntityName();
} else if (element instanceof Table) {
- key = TextUtil.getTableName((Table)element);
+ key = HibernateUtils.getTableName((Table)element);
} else if (element instanceof Property) {
Property property = (Property)element;
key = property.getPersistentClass().getEntityName() + "." + property.getName();
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/DiagramEditPart.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/DiagramEditPart.java 2007-08-07 14:56:35 UTC (rev 2935)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/DiagramEditPart.java 2007-08-07 16:24:07 UTC (rev 2936)
@@ -54,7 +54,7 @@
import org.jboss.tools.hibernate.ui.veditor.editors.model.Shape;
import org.jboss.tools.hibernate.ui.veditor.editors.model.SpecialOrmShape;
import org.jboss.tools.hibernate.ui.veditor.editors.model.SpecialRootClass;
-import org.jboss.tools.hibernate.ui.view.views.TextUtil;
+import org.jboss.tools.hibernate.ui.view.views.HibernateUtils;
class DiagramEditPart extends OrmEditPart implements PropertyChangeListener {
@@ -129,7 +129,7 @@
tempPoint = 40 + getChildrenFigurePreferredHeight(ormShape);
}
Table table = persistentClass.getTable();
- ormShape = (OrmShape) hashMap.remove(TextUtil.getTableName(table));
+ ormShape = (OrmShape) hashMap.remove(HibernateUtils.getTableName(table));
if (ormShape != null) {
ormShape.setLocation(new Point(pointX, 20));
point = 40 + getChildrenFigurePreferredHeight(ormShape);
@@ -152,7 +152,7 @@
.getOrmElement())).getProperty().getValue())
.getElement();
Table ownerTable = component.getOwner().getTable();
- ormShape = (OrmShape) hashMap.remove(TextUtil.getTableName(ownerTable));
+ ormShape = (OrmShape) hashMap.remove(HibernateUtils.getTableName(ownerTable));
// }
// if (ormShape != null ) {
// ormShape.setLocation(new Point(pointX,point));
Copied: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/HibernateUtils.java (from rev 2800, trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/TextUtil.java)
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/HibernateUtils.java (rev 0)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/HibernateUtils.java 2007-08-07 16:24:07 UTC (rev 2936)
@@ -0,0 +1,45 @@
+package org.jboss.tools.hibernate.ui.view.views;
+
+import java.util.Iterator;
+
+import org.hibernate.mapping.Column;
+import org.hibernate.mapping.ForeignKey;
+import org.hibernate.mapping.Table;
+
+public class HibernateUtils {
+
+ public static String getTableName(Table table) {
+ String schema = table.getSchema();
+ String catalog = table.getCatalog();
+ return (schema != null ? schema + "." : "") + (catalog != null ? catalog + "." : "") + table.getName();
+ }
+
+ public static boolean isPrimaryKey(Column column){
+ Table table = getTable(column);
+ if(table != null){
+ if(table.getPrimaryKey() != null){
+ if(table.getPrimaryKey().containsColumn(column)) return true;
+ }
+ }
+ return false;
+ }
+
+ public static boolean isForeignKey(Column column){
+ Table table = getTable(column);
+ if(table != null){
+ Iterator iter = table.getForeignKeyIterator();
+ while(iter.hasNext()){
+ ForeignKey fk = (ForeignKey)iter.next();
+ if(fk.containsColumn(column)) return true;
+ }
+ }
+ return false;
+
+ }
+
+ public static Table getTable(Column column){
+ if(column.getValue() != null)
+ return column.getValue().getTable();
+ return null;
+ }
+}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmModelImageVisitor.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmModelImageVisitor.java 2007-08-07 14:56:35 UTC (rev 2935)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmModelImageVisitor.java 2007-08-07 16:24:07 UTC (rev 2936)
@@ -10,11 +10,13 @@
******************************************************************************/
package org.jboss.tools.hibernate.ui.view.views;
+import java.util.Iterator;
import java.util.ResourceBundle;
import org.hibernate.mapping.Column;
import org.hibernate.mapping.Component;
import org.hibernate.mapping.DependantValue;
+import org.hibernate.mapping.ForeignKey;
import org.hibernate.mapping.JoinedSubclass;
import org.hibernate.mapping.PersistentClassVisitor;
import org.hibernate.mapping.Property;
@@ -25,8 +27,10 @@
import org.hibernate.mapping.UnionSubclass;
import org.jboss.tools.hibernate.ui.view.ViewPlugin;
+import sun.text.CompactShortArray;
+
/**
* @author Tau
*
@@ -46,10 +50,16 @@
public Object visitDatabaseColumn(Column column) {
if(column.isUnique()) {
return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.DatabaseUniqueKeyColumn"));
+ }else if (HibernateUtils.isPrimaryKey(column)&& HibernateUtils.getTable(column) != null && HibernateUtils.isForeignKey(column)){
+ return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.DatabasePrimaryForeignKeysColumn"));
+ } else if (HibernateUtils.isPrimaryKey(column)){
+ return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.DatabasePrimaryKeyColumn")); //$NON-NLS-1$
+ } else if (HibernateUtils.getTable(column) != null && HibernateUtils.isForeignKey(column)){
+ return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.DatabaseForeignKeyColumn")); //$NON-NLS-1$
} else return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.DatabaseColumn")); //$NON-NLS-1$
}
-
+
public Object visitPersistentField(Property field, Object argument) {
if (field !=null){
try {
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmModelNameVisitor.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmModelNameVisitor.java 2007-08-07 14:56:35 UTC (rev 2935)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmModelNameVisitor.java 2007-08-07 16:24:07 UTC (rev 2936)
@@ -223,7 +223,7 @@
Table table = clazz.getTable(); // upd tau 06.06.2005
//IDatabaseTable table = HibernateAutoMappingHelper.getPrivateTable(classMapping); // upd tau 18.04.2005
if (table != null) {
- String tableName = TextUtil.getTableName(table);
+ String tableName = HibernateUtils.getTableName(table);
if (tableName != null) {
//name.append(" (");
name.append(POINTER);
@@ -237,7 +237,7 @@
public Object visitTable(Table table, Object argument) {
StringBuffer name = new StringBuffer();
- name.append(TextUtil.getTableName(table));
+ name.append(HibernateUtils.getTableName(table));
return name.toString();
}
@@ -248,7 +248,7 @@
Table table = clazz.getTable();
if (table != null) {
- String tableName = TextUtil.getTableName(table);
+ String tableName = HibernateUtils.getTableName(table);
if (tableName != null) {
name.append(POINTER);
name.append(tableName);
Deleted: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/TextUtil.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/TextUtil.java 2007-08-07 14:56:35 UTC (rev 2935)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/TextUtil.java 2007-08-07 16:24:07 UTC (rev 2936)
@@ -1,11 +0,0 @@
-package org.jboss.tools.hibernate.ui.view.views;
-
-import org.hibernate.mapping.Table;
-
-public class TextUtil {
- public static String getTableName(Table table) {
- String schema = table.getSchema();
- String catalog = table.getCatalog();
- return (schema != null ? schema + "." : "") + (catalog != null ? catalog + "." : "") + table.getName();
- }
-}
18 years, 4 months
JBoss Tools SVN: r2935 - in trunk/seam/tests/org.jboss.tools.seam.core.test: projects/TestScanner/WebContent/WEB-INF and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-08-07 10:56:35 -0400 (Tue, 07 Aug 2007)
New Revision: 2935
Added:
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestScanner/WebContent/WEB-INF/lib/ejb3-persistence.jar
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestScanner/WebContent/WEB-INF/lib/jboss-ejb3x.jar
Modified:
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestScanner/JavaSource/demo/User.java
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestScanner/WebContent/WEB-INF/components.xml
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/ScannerTest.java
Log:
EXIN-336 more tests added
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestScanner/JavaSource/demo/User.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestScanner/JavaSource/demo/User.java 2007-08-07 14:04:02 UTC (rev 2934)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestScanner/JavaSource/demo/User.java 2007-08-07 14:56:35 UTC (rev 2935)
@@ -10,6 +10,8 @@
******************************************************************************/
package demo;
+import javax.persistence.Entity;
+
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.*;
@@ -19,10 +21,18 @@
@Name("myUser")
@Scope(ScopeType.APPLICATION)
+@Entity
+(a)Install(precedence=Install.FRAMEWORK)
public class User {
private String name;
+
+ @Out
+ private String address = "";
+
+ @In
+ private String payment = "";
/**
* @return User Name
@@ -37,4 +47,21 @@
public void setName(String name) {
this.name = name;
}
-}
\ No newline at end of file
+
+ public String getAddress() {
+ return address;
+ }
+
+ public String getPayment() {
+ return payment;
+ }
+
+ @Unwrap
+ public void unwrapMethod() {
+ }
+
+ @Create @Destroy
+ public void createAndDestroyMethod() {
+ }
+
+}
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestScanner/WebContent/WEB-INF/components.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestScanner/WebContent/WEB-INF/components.xml 2007-08-07 14:04:02 UTC (rev 2934)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestScanner/WebContent/WEB-INF/components.xml 2007-08-07 14:56:35 UTC (rev 2935)
@@ -7,6 +7,10 @@
<property name="myList">
<value>value1</value>
</property>
+ <property name="myMap">
+ <key>key1</key>
+ <value>map value 1</value>
+ </property>
</component>
<core:managed-persistence-context name="myPersistenceContext1"/>
Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestScanner/WebContent/WEB-INF/lib/ejb3-persistence.jar
===================================================================
(Binary files differ)
Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestScanner/WebContent/WEB-INF/lib/ejb3-persistence.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestScanner/WebContent/WEB-INF/lib/jboss-ejb3x.jar
===================================================================
(Binary files differ)
Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestScanner/WebContent/WEB-INF/lib/jboss-ejb3x.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/ScannerTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/ScannerTest.java 2007-08-07 14:04:02 UTC (rev 2934)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/ScannerTest.java 2007-08-07 14:56:35 UTC (rev 2935)
@@ -22,14 +22,20 @@
import org.eclipse.core.runtime.NullProgressMonitor;
import org.jboss.tools.common.model.XJob;
import org.jboss.tools.common.test.util.TestProjectProvider;
+import org.jboss.tools.seam.core.BijectedAttributeType;
+import org.jboss.tools.seam.core.IBijectedAttribute;
import org.jboss.tools.seam.core.ISeamComponent;
import org.jboss.tools.seam.core.ISeamComponentDeclaration;
import org.jboss.tools.seam.core.ISeamFactory;
+import org.jboss.tools.seam.core.ISeamJavaComponentDeclaration;
import org.jboss.tools.seam.core.ISeamProject;
import org.jboss.tools.seam.core.ISeamProperty;
+import org.jboss.tools.seam.core.ISeamXmlComponentDeclaration;
import org.jboss.tools.seam.core.ScopeType;
import org.jboss.tools.seam.core.SeamCoreBuilder;
import org.jboss.tools.seam.core.event.ISeamValueList;
+import org.jboss.tools.seam.core.event.ISeamValueMap;
+import org.jboss.tools.seam.core.event.ISeamValueMapEntry;
import org.jboss.tools.seam.core.event.ISeamValueString;
import org.jboss.tools.seam.internal.core.SeamProject;
import org.jboss.tools.seam.internal.core.scanner.IFileScanner;
@@ -88,6 +94,10 @@
public void testCreatingProject() {
}
+ /**
+ * This test is to check different cases of declaring components in xml.
+ * It does not check interaction of xml declaration with other declarations.
+ */
public void testXMLScanner() {
ISeamProject seamProject = getSeamProject();
@@ -106,24 +116,74 @@
}
assertTrue("Components are not found in components.xml", cs != null && cs.length > 0);
- assertTrue("First component name must be " + "myComponent", "myComponent".equals(cs[0].getName()));
+ //1. components.xml has entry
+ // <component class="java.lang.Boolean" name="myComponent" scope="page">
+ // <property name="property1">value1</property>
+ // <property name="myList">
+ // <value>value1</value>
+ // </property>
+ // <property name="myMap">
+ // <key>key1</key>
+ // <value>map value 1</value>
+ // </property>
+ // </component>
+ // check that
+ // a) Declaration "myComponent" is loaded
+ // b) property "property1" has value 'value1'
+ // c) property "myList" has value 'value1'
+ // d) property "myMap" has value 'map value 1' for key 'key1'
+ ISeamComponentDeclaration myComponent = findDeclaration(cs, "myComponent");
+ assertTrue("Declaration of " + "myComponent" + " is not found", myComponent instanceof ISeamXmlComponentDeclaration);
- //After having tested details of xml scanner now let us check
- // that it succeeded in build.
- ISeamComponent c = seamProject.getComponent("myComponent");
-
- assertTrue("Seam builder must put myComponent to project.", c != null);
-
//We have list property in this component
- List<ISeamProperty> prs = c.getProperties("myList");
- assertTrue("Property myList is not found in components.xml", prs.size() == 1);
- ISeamProperty property = prs.get(0);
+ ISeamProperty property = ((ISeamXmlComponentDeclaration)myComponent).getProperty("myList");
+ assertTrue("Property myList is not found in declaration 'myComponent'", property != null);
Object o = property.getValue();
assertTrue("Property myList in myComponent must be instanceof ISeamValueList", o instanceof ISeamValueList);
ISeamValueList oList = (ISeamValueList)o;
assertTrue("Property myList misses value 'value1.", "value1".equals(oList.getValues().get(0).getValue().getValue()));
+
+ property = ((ISeamXmlComponentDeclaration)myComponent).getProperty("myMap");
+ assertTrue("Property myMap is not found in declaration 'myComponent'", property != null);
+ o = property.getValue();
+ assertTrue("Property myMap in myComponent must be instanceof ISeamValueMap", o instanceof ISeamValueMap);
+ ISeamValueMap oMap = (ISeamValueMap)o;
+ List<ISeamValueMapEntry> es = oMap.getEntries();
+ assertTrue("Property myMap in myComponent is empty", es.size() > 0);
+
+ assertTrue("First entry in myMap must have key='key1'", "key1".equals(es.get(0).getKey().getValue().getValue()));
+ assertTrue("First entry in myMap must have value='map value 1'", "map value 1".equals(es.get(0).getValue().getValue().getValue()));
+
+ //2. components.xml has entry
+ // <core:resource-bundle>
+ // <core:bundle-names>
+ // <value>bundleA</value>
+ // <value>bundleB</value>
+ // </core:bundle-names>
+ // </core:resource-bundle>
+ // check that
+ // a) declaration org.jboss.seam.core.resourceBundle exists,
+ // b) it has property bundleNames as list with two specified values.
+ ISeamComponentDeclaration resourceBundle = findDeclaration(cs, "org.jboss.seam.core.resourceBundle");
+ assertTrue("Declaration of " + "org.jboss.seam.core.resourceBundle" + " is not found", resourceBundle instanceof ISeamXmlComponentDeclaration);
+ property = ((ISeamXmlComponentDeclaration)resourceBundle).getProperty("bundleNames");
+ assertTrue("Property 'bundleNames' is not found in declaration 'org.jboss.seam.core.resourceBundle'", property != null);
+ o = property.getValue();
+ assertTrue("Property bundleNames in myComponent must be instanceof ISeamValueList", o instanceof ISeamValueList);
+ oList = (ISeamValueList)o;
+ assertTrue("Property bundleNames misses value 'bundleA'.", "bundleA".equals(oList.getValues().get(0).getValue().getValue()));
+ assertTrue("Property bundleNames misses value 'bundleB'.", "bundleB".equals(oList.getValues().get(1).getValue().getValue()));
+
+ //TODO check factory
}
+ private ISeamComponentDeclaration findDeclaration(ISeamComponentDeclaration[] declarations, String name) {
+ for (int i = 0; i < declarations.length; i++) {
+ if(name.equals(declarations[i].getName())) return declarations[i];
+ }
+ return null;
+ }
+
public void testJavaScanner() {
ISeamProject seamProject = getSeamProject();
@@ -141,16 +201,49 @@
fail("Error in java scanner:" + e.getMessage());
}
assertTrue("Components are not found in User.java", cs != null && cs.length > 0);
+
+ ISeamJavaComponentDeclaration myUser = (ISeamJavaComponentDeclaration)findDeclaration(cs, "myUser");
- assertTrue("First component name must be " + "myUser", "myUser".equals(cs[0].getName()));
+ assertTrue("Component declaration myUser not found", myUser != null);
//After having tested details of java scanner now let us check
//that it succeeded in build.
ISeamComponent c = seamProject.getComponent("myUser");
+ assertTrue("Seam builder must put myUser to project.", c != null);
+
+ //Now check annotations in User.java
+ // a) @Scope(ScopeType.APPLICATION)
+ ScopeType scope = myUser.getScope();
+ assertTrue("Declared scope for myUser is Application rather than " + scope.getLabel(), scope == ScopeType.APPLICATION);
- assertTrue("Seam builder must put myUser to project.", c != null);
+ // b) @Install(precedence=Install.FRAMEWORK)
+ int precedence = c.getPrecedence();
+ assertTrue("Declared precedence for myUser is 10 rather than " + precedence, precedence == 10);
+
+ // c) @Entity
+ boolean isEntity = myUser.isEntity();
+ assertTrue("Java source for myUser is declared as entity", isEntity);
+
+ // d) @In @Out
+ Set<IBijectedAttribute> bijected = myUser.getBijectedAttributes();
+
+ IBijectedAttribute a1 = findBijectedAttribute(bijected, "address");
+ assertTrue("Attribute 'address' is not found in bijected attributes", a1 != null);
+ assertTrue("Attribute 'address' is @Out annotated", a1.isOfType(BijectedAttributeType.OUT));
+ IBijectedAttribute a2 = findBijectedAttribute(bijected, "payment");
+ assertTrue("Attribute 'payment' is not found in bijected attributes", a2 != null);
+ assertTrue("Attribute 'payment' is @In annotated", a2.isOfType(BijectedAttributeType.IN));
+
+ //To be continued
}
+
+ private IBijectedAttribute findBijectedAttribute(Set<IBijectedAttribute> bijected, String name) {
+ for (IBijectedAttribute a : bijected) {
+ if(name.equals(a.getName())) return a;
+ }
+ return null;
+ }
public void testLibraryScanner() {
ISeamProject seamProject = getSeamProject();
18 years, 4 months
JBoss Tools SVN: r2934 - trunk/core/tests/org.jboss.ide.eclipse.archives.test.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2007-08-07 10:04:02 -0400 (Tue, 07 Aug 2007)
New Revision: 2934
Removed:
trunk/core/tests/org.jboss.ide.eclipse.archives.test/bin/
Modified:
trunk/core/tests/org.jboss.ide.eclipse.archives.test/
Log:
even more bin ignore
Property changes on: trunk/core/tests/org.jboss.ide.eclipse.archives.test
___________________________________________________________________
Name: svn:ignore
+ bin
18 years, 4 months
JBoss Tools SVN: r2933 - in trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core: scanner/java and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-08-07 09:27:51 -0400 (Tue, 07 Aug 2007)
New Revision: 2933
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamJavaComponentDeclaration.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/java/ValueInfo.java
Log:
EXIN-217 - Fixed setting precedence value given like Install.FRAMEWORK etc.
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamJavaComponentDeclaration.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamJavaComponentDeclaration.java 2007-08-07 13:22:54 UTC (rev 2932)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamJavaComponentDeclaration.java 2007-08-07 13:27:51 UTC (rev 2933)
@@ -335,15 +335,31 @@
attributes.put(ISeamXmlComponentDeclaration.SCOPE, value);
setScope(value == null ? null : value.getValue());
}
+
+ static final Map<String, Integer> NAMED_PRECEDENCES = new HashMap<String, Integer>();
+
+ static {
+ NAMED_PRECEDENCES.put("Install.BUILT_IN", new Integer(0));
+ NAMED_PRECEDENCES.put("Install.FRAMEWORK", new Integer(10));
+ NAMED_PRECEDENCES.put("Install.APPLICATION", new Integer(20));
+ NAMED_PRECEDENCES.put("Install.DEPLOYMENT", new Integer(30));
+ NAMED_PRECEDENCES.put("Install.MOCK", new Integer(40));
+ }
public void setPrecedence(IValueInfo value) {
attributes.put(ISeamXmlComponentDeclaration.PRECEDENCE, value);
- try {
- setPrecedence(value == null ? 0 : Integer.parseInt(value.getValue()));
+ String p = value.getValue();
+ if(p == null) {
+ setPrecedence(0);
+ return;
+ }
+ Integer i = NAMED_PRECEDENCES.get(p);
+ if(i == null) try {
+ i = Integer.parseInt(p);
} catch (NumberFormatException e) {
- setPrecedence(-1); //error value
//ignore - exact value is stored in ValueInfo
}
+ setPrecedence(i == null ? -1 : i.intValue());
}
public void setTypes(Map<BeanType, IValueInfo> types) {
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/java/ValueInfo.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/java/ValueInfo.java 2007-08-07 13:22:54 UTC (rev 2932)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/java/ValueInfo.java 2007-08-07 13:27:51 UTC (rev 2933)
@@ -74,8 +74,12 @@
if(exp instanceof StringLiteral) {
return ((StringLiteral)exp).getLiteralValue();
} else if(exp instanceof QualifiedName) {
+ Object o = exp.resolveConstantExpressionValue();
+ if(o != null) return o.toString();
return exp.toString();
}
+ Object o = exp.resolveConstantExpressionValue();
+ if(o != null) return o.toString();
return exp.toString();
}
18 years, 4 months
JBoss Tools SVN: r2932 - trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/helpers/bean.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-08-07 09:22:54 -0400 (Tue, 07 Aug 2007)
New Revision: 2932
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/helpers/bean/AnnotatedBeans.java
Log:
JBIDE-670, EXIN-161 - Old simple scanning for seam components removed.
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/helpers/bean/AnnotatedBeans.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/helpers/bean/AnnotatedBeans.java 2007-08-07 13:11:15 UTC (rev 2931)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/helpers/bean/AnnotatedBeans.java 2007-08-07 13:22:54 UTC (rev 2932)
@@ -13,7 +13,6 @@
import java.util.*;
import org.eclipse.core.resources.*;
import org.eclipse.jdt.core.*;
-import org.eclipse.jdt.core.dom.*;
import org.jboss.tools.common.model.*;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.jsf.JSFModelPlugin;
@@ -34,7 +33,7 @@
IProject project;
Map<String,XModelObject> beans = new HashMap<String,XModelObject>();
- String annotationType = "org.jboss.seam.annotations.Name";
+// String annotationType = "org.jboss.seam.annotations.Name";
private AnnotatedBeans() {}
@@ -62,26 +61,21 @@
if(src == null) {
return;
}
- IJavaProject javaProject = (IJavaProject)project.getNature(JavaCore.NATURE_ID);
+// IJavaProject javaProject = (IJavaProject)project.getNature(JavaCore.NATURE_ID);
+
+/**
+ //This is how we can obtain annotated seam components.
+ //However, it may be not needed now since we have separate Seam Components view
+ //and separate code assist based on seam model.
+ ISeamProject seamProject = SeamCorePlugin.getSeamProject(project, true);
- ASTRequestorImpl requestor = new ASTRequestorImpl();
- Set<ICompilationUnit> units = new HashSet<ICompilationUnit>();
+ Set<ISeamComponent> cs = seamProject.getComponents();
- for (IResource resource : src) {
- IPackageFragmentRoot pfr = javaProject.getPackageFragmentRoot(resource);
- collectCompilationUnits(pfr, units);
- }
-
- ICompilationUnit[] us = units.toArray(new ICompilationUnit[0]);
- // This triggers a full resolve of all types, even inside jars...NOT scalable at all!
- ASTParser.newParser(AST.JLS3).createASTs(us, new String[0], requestor, null);
-
- Map map = requestor.getBeans();
Set<String> set = new HashSet<String>();
- Iterator it = map.keySet().iterator();
- while(it.hasNext()) {
- String name = it.next().toString();
- String cls = map.get(name).toString();
+ for (ISeamComponent c : cs) {
+ String name = c.getName();
+ String cls = c.getClassName();
+ if(cls == null) cls = "";
XModelObject o = beans.get(name);
if(o == null) {
o = model.createModelObject("JSFManagedBean", null);
@@ -94,10 +88,11 @@
set.add(name);
}
// TODO: why does the beans set have to double checkked for duplicates ?
- it = beans.keySet().iterator();
+ Iterator<String> it = beans.keySet().iterator();
while(it.hasNext()) {
if(!set.contains(it.next())) it.remove();
}
+*/
}
void collectCompilationUnits(IParent parent, Set<ICompilationUnit> units) throws Exception {
@@ -114,86 +109,86 @@
}
}
- class ASTRequestorImpl extends ASTRequestor {
- private ASTVisitorImpl visitor = new ASTVisitorImpl();
- private Map<String, String> beans = new HashMap<String, String>();
-
- public Map<String, String> getBeans() {
- return beans;
- }
-
- public void acceptAST(ICompilationUnit source, CompilationUnit ast) {
- visitor.name = null;
-
- try {
- IType[] ts = source.getTypes();
- if(ts != null && ts.length > 0) {
- visitor.type = ts[0];
- }
- } catch (Exception e) {
- //ignore
- }
- ast.accept(visitor);
- if(visitor.name != null && visitor.type != null) {
- String n = visitor.type.getElementName();
- n = getResolvedType(visitor.type, n);
- beans.put(visitor.name, n);
- }
- }
- }
+// class ASTRequestorImpl extends ASTRequestor {
+// private ASTVisitorImpl visitor = new ASTVisitorImpl();
+// private Map<String, String> beans = new HashMap<String, String>();
+//
+// public Map<String, String> getBeans() {
+// return beans;
+// }
+//
+// public void acceptAST(ICompilationUnit source, CompilationUnit ast) {
+// visitor.name = null;
+//
+// try {
+// IType[] ts = source.getTypes();
+// if(ts != null && ts.length > 0) {
+// visitor.type = ts[0];
+// }
+// } catch (Exception e) {
+// //ignore
+// }
+// ast.accept(visitor);
+// if(visitor.name != null && visitor.type != null) {
+// String n = visitor.type.getElementName();
+// n = getResolvedType(visitor.type, n);
+// beans.put(visitor.name, n);
+// }
+// }
+// }
- class ASTVisitorImpl extends ASTVisitor {
- IType type;
- String name = null;
- public boolean visit(SingleMemberAnnotation node) {
- if(!checkAnnotationType(node)) return false;
- checkExpression(node.getValue());
- return true;
- }
- public boolean visit(NormalAnnotation node) {
- if(!checkAnnotationType(node)) return false;
- List vs = node.values();
- if(vs != null) for (int i = 0; i < vs.size(); i++) {
- MemberValuePair p = (MemberValuePair)vs.get(i);
- if("value".equals(p.getName().getIdentifier())) {
- checkExpression(p.getValue());
- }
- }
- return true;
- }
-
- boolean checkAnnotationType(Annotation node) {
- Name nm = node.getTypeName();
- if(nm instanceof SimpleName) {
- SimpleName sn = (SimpleName)nm;
- String n = sn.getIdentifier();
- if(type != null) {
- n = getResolvedType(type, n);
- }
- if(!annotationType.equals(n)) return false;
- } else if(nm instanceof QualifiedName) {
- QualifiedName qn = (QualifiedName)nm;
- if(!qn.getFullyQualifiedName().equals(annotationType)) return false;
- //improve
- } else {
- return false;
- }
- return true;
- }
-
- void checkExpression(Expression exp) {
- if(exp instanceof StringLiteral) {
- name = ((StringLiteral)exp).getLiteralValue();
- }
- }
-
- public boolean visit(Block node) {
- return false;
- }
- public boolean visit(MethodDeclaration node) {
- return false;
- }
- }
+// class ASTVisitorImpl extends ASTVisitor {
+// IType type;
+// String name = null;
+// public boolean visit(SingleMemberAnnotation node) {
+// if(!checkAnnotationType(node)) return false;
+// checkExpression(node.getValue());
+// return true;
+// }
+// public boolean visit(NormalAnnotation node) {
+// if(!checkAnnotationType(node)) return false;
+// List vs = node.values();
+// if(vs != null) for (int i = 0; i < vs.size(); i++) {
+// MemberValuePair p = (MemberValuePair)vs.get(i);
+// if("value".equals(p.getName().getIdentifier())) {
+// checkExpression(p.getValue());
+// }
+// }
+// return true;
+// }
+//
+// boolean checkAnnotationType(Annotation node) {
+// Name nm = node.getTypeName();
+// if(nm instanceof SimpleName) {
+// SimpleName sn = (SimpleName)nm;
+// String n = sn.getIdentifier();
+// if(type != null) {
+// n = getResolvedType(type, n);
+// }
+// if(!annotationType.equals(n)) return false;
+// } else if(nm instanceof QualifiedName) {
+// QualifiedName qn = (QualifiedName)nm;
+// if(!qn.getFullyQualifiedName().equals(annotationType)) return false;
+// //improve
+// } else {
+// return false;
+// }
+// return true;
+// }
+//
+// void checkExpression(Expression exp) {
+// if(exp instanceof StringLiteral) {
+// name = ((StringLiteral)exp).getLiteralValue();
+// }
+// }
+//
+// public boolean visit(Block node) {
+// return false;
+// }
+// public boolean visit(MethodDeclaration node) {
+// return false;
+// }
+// }
String getResolvedType(IType type, String n) {
try {
18 years, 4 months
JBoss Tools SVN: r2931 - trunk/seam/plugins/org.jboss.tools.seam.ui.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2007-08-07 09:11:15 -0400 (Tue, 07 Aug 2007)
New Revision: 2931
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml
Log:
http://jira.jboss.com/jira/browse/JBIDE-670 xhtml code completion does not update it's list of completions
Seam proposal duplicates on XML files are fixed
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml 2007-08-07 12:47:57 UTC (rev 2930)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml 2007-08-07 13:11:15 UTC (rev 2931)
@@ -245,18 +245,6 @@
class="org.jboss.tools.seam.ui.text.java.SeamELProposalProcessor"
id="org.jboss.tools.seam.ui.text.java.SeamELProposalProcessor">
<partitiontype id="org.eclipse.wst.xml.XML_DEFAULT" />
- </contentAssistProcessor>
- </extension>
-
- <extension
- point="org.jboss.tools.common.text.xml.contentAssistProcessor"
- id="org.jboss.tools.seam.ui.contentAssistProcessor"
- name="org.jboss.tools.seam.ui.contentAssistProcessor">
-
- <contentAssistProcessor
- class="org.jboss.tools.seam.ui.text.java.SeamELProposalProcessor"
- id="org.jboss.tools.seam.ui.text.java.SeamELProposalProcessor">
- <partitiontype id="org.eclipse.wst.xml.XML_DEFAULT" />
<partitiontype id="org.eclipse.wst.html.HTML_DEFAULT" />
<partitiontype id="org.eclipse.jst.jsp.DEFAULT_JSP" />
<partitiontype id="org.eclipse.jst.jsp.JSP_DIRECTIVE" />
18 years, 4 months
JBoss Tools SVN: r2930 - trunk/documentation/whatsnew/seam.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2007-08-07 08:47:57 -0400 (Tue, 07 Aug 2007)
New Revision: 2930
Modified:
trunk/documentation/whatsnew/seam/seamcomponents-filter.png
Log:
reduce screenshot size
Modified: trunk/documentation/whatsnew/seam/seamcomponents-filter.png
===================================================================
(Binary files differ)
18 years, 4 months