JBoss Tools SVN: r3872 - tags/TOOLS_3_2_0_beta11.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2007-09-27 14:28:08 -0400 (Thu, 27 Sep 2007)
New Revision: 3872
Added:
tags/TOOLS_3_2_0_beta11/hibernatetools/
Log:
Created folder remotely
16 years, 7 months
JBoss Tools SVN: r3871 - tags.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2007-09-27 14:27:47 -0400 (Thu, 27 Sep 2007)
New Revision: 3871
Added:
tags/TOOLS_3_2_0_beta11/
Log:
Created folder remotely
16 years, 7 months
JBoss Tools SVN: r3870 - trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/text/java.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2007-09-27 13:11:50 -0400 (Thu, 27 Sep 2007)
New Revision: 3870
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/text/java/SeamELProposalProcessor.java
Log:
http://jira.jboss.org/jira/browse/JBIDE-949 seam validator reports
Seam EL Content Assist processor is fixed
Seam EL validator is fixed
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/text/java/SeamELProposalProcessor.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/text/java/SeamELProposalProcessor.java 2007-09-27 17:11:39 UTC (rev 3869)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/text/java/SeamELProposalProcessor.java 2007-09-27 17:11:50 UTC (rev 3870)
@@ -259,7 +259,9 @@
public int compare(ICompletionProposal arg0,
ICompletionProposal arg1) {
- return arg1.getDisplayString().compareTo(arg1.getDisplayString());
+ String str0 = (arg0 == null ? "" : arg0.getDisplayString());
+ String str1 = (arg1 == null ? "" : arg1.getDisplayString());
+ return str0.compareTo(str1);
}});
return resultArray;
} catch (BadLocationException x) {
16 years, 7 months
JBoss Tools SVN: r3869 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2007-09-27 13:11:39 -0400 (Thu, 27 Sep 2007)
New Revision: 3869
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamELValidator.java
Log:
http://jira.jboss.org/jira/browse/JBIDE-949 seam validator reports
Seam EL Content Assist processor is fixed
Seam EL validator is fixed
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamELValidator.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamELValidator.java 2007-09-27 16:21:54 UTC (rev 3868)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamELValidator.java 2007-09-27 17:11:39 UTC (rev 3869)
@@ -240,44 +240,46 @@
String exp = el.value;
int offset = exp.length();
- String prefix = SeamELCompletionEngine.getPrefix(exp, offset);
- if(prefix!=null) {
- int possition = exp.indexOf(prefix);
- if (possition == -1) possition = 0;
-
- Set<ISeamContextVariable> usedVariables = new HashSet<ISeamContextVariable>();
- Map<String, IMethod> unpairedGettersOrSetters = new HashMap<String, IMethod>();
-
- List<String> suggestions = engine.getCompletions(project, file, exp, prefix, possition, true, usedVariables, unpairedGettersOrSetters);
-
- if(usedVariables.size()==0 && suggestions.size()==0) {
- // Save resources with unknown variables names
- validationContext.addUnnamedElResource(file.getFullPath());
- } else {
- // Save links between resource and used variables names
- for(ISeamContextVariable variable: usedVariables) {
- validationContext.addLinkedElResource(variable.getName(), file.getFullPath());
+ if (!exp.endsWith(".")) {
+ String prefix = SeamELCompletionEngine.getPrefix(exp, offset);
+ if(prefix!=null) {
+ int possition = exp.indexOf(prefix);
+ if (possition == -1) possition = 0;
+
+ Set<ISeamContextVariable> usedVariables = new HashSet<ISeamContextVariable>();
+ Map<String, IMethod> unpairedGettersOrSetters = new HashMap<String, IMethod>();
+
+ List<String> suggestions = engine.getCompletions(project, file, exp, prefix, possition, true, usedVariables, unpairedGettersOrSetters);
+
+ if(usedVariables.size()==0 && suggestions.size()==0) {
+ // Save resources with unknown variables names
+ validationContext.addUnnamedElResource(file.getFullPath());
+ } else {
+ // Save links between resource and used variables names
+ for(ISeamContextVariable variable: usedVariables) {
+ validationContext.addLinkedElResource(variable.getName(), file.getFullPath());
+ }
}
- }
-
- // Check pair for getter/setter
- if(unpairedGettersOrSetters.size()>0) {
- IMethod unpairedMethod = unpairedGettersOrSetters.values().iterator().next();
- String methodName = unpairedMethod.getElementName();
- String propertyName = unpairedGettersOrSetters.keySet().iterator().next();
- String missingMethodName = "Setter";
- String existedMethodName = "Getter";
- if(methodName.startsWith("s")) {
- missingMethodName = existedMethodName;
- existedMethodName = "Setter";
+
+ // Check pair for getter/setter
+ if(unpairedGettersOrSetters.size()>0) {
+ IMethod unpairedMethod = unpairedGettersOrSetters.values().iterator().next();
+ String methodName = unpairedMethod.getElementName();
+ String propertyName = unpairedGettersOrSetters.keySet().iterator().next();
+ String missingMethodName = "Setter";
+ String existedMethodName = "Getter";
+ if(methodName.startsWith("s")) {
+ missingMethodName = existedMethodName;
+ existedMethodName = "Setter";
+ }
+ addError(UNPAIRED_GETTER_OR_SETTER_MESSAGE_ID, SeamPreferences.UNPAIRED_GETTER_OR_SETTER, new String[]{propertyName, existedMethodName, missingMethodName}, el.getLength(), el.getOffset(), file);
}
- addError(UNPAIRED_GETTER_OR_SETTER_MESSAGE_ID, SeamPreferences.UNPAIRED_GETTER_OR_SETTER, new String[]{propertyName, existedMethodName, missingMethodName}, el.getLength(), el.getOffset(), file);
+
+ if (suggestions != null && suggestions.size() > 0) {
+ // It's valid EL.
+ return;
+ }
}
-
- if (suggestions != null && suggestions.size() > 0) {
- // It's valid EL.
- return;
- }
}
} catch (BadLocationException e) {
SeamCorePlugin.getDefault().logError("Error validating Seam EL", e);
16 years, 7 months
JBoss Tools SVN: r3868 - trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2007-09-27 12:21:54 -0400 (Thu, 27 Sep 2007)
New Revision: 3868
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/FakeTransactionManagerLookup.java
Log:
JBIDE-799 avoid exception with respect to transaction manager lookup
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/FakeTransactionManagerLookup.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/FakeTransactionManagerLookup.java 2007-09-27 15:40:55 UTC (rev 3867)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/FakeTransactionManagerLookup.java 2007-09-27 16:21:54 UTC (rev 3868)
@@ -34,7 +34,7 @@
}
public String getUserTransactionName() {
- throw new UnsupportedOperationException();
+ return null; //throw new UnsupportedOperationException();
}
}
16 years, 7 months
JBoss Tools SVN: r3867 - trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/action.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-09-27 11:40:55 -0400 (Thu, 27 Sep 2007)
New Revision: 3867
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/action/ActionX.java
Log:
JBIDE-956
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/action/ActionX.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/action/ActionX.java 2007-09-27 15:10:29 UTC (rev 3866)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/action/ActionX.java 2007-09-27 15:40:55 UTC (rev 3867)
@@ -29,6 +29,7 @@
public ActionX(XModelObjectAction a) {
wrapper = a;
this.action = a.action;
+ boolean enabled = (wrapper.targets == null) ? action.isEnabled(wrapper.object) : action.isEnabled(wrapper.object, wrapper.targets);
String displayName = action.getDisplayName();
String baseName = action.getBaseActionName();
@@ -59,7 +60,6 @@
Image image = action.getMetaModel().getIconList().getImage("action.empty");
setImageDescriptor(new XImageDescriptor(image));
}
- boolean enabled = (wrapper.targets == null) ? action.isEnabled(wrapper.object) : action.isEnabled(wrapper.object, wrapper.targets);
setEnabled(enabled);
}
16 years, 7 months
JBoss Tools SVN: r3866 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2007-09-27 11:10:29 -0400 (Thu, 27 Sep 2007)
New Revision: 3866
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegete.java
Log:
http://jira.jboss.org/jira/browse/JBIDE-927
filters for CVS and .svn folders added
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegete.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegete.java 2007-09-27 14:25:26 UTC (rev 3865)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegete.java 2007-09-27 15:10:29 UTC (rev 3866)
@@ -178,6 +178,8 @@
public static AntCopyUtils.FileSet CVS_SVN = new AntCopyUtils.FileSet()
.include(".*")
.exclude(".*/CVS")
+ .exclude("CVS")
+ .exclude(".*\\.svn")
.exclude(".*/\\.svn");
public static AntCopyUtils.FileSet JBOOS_WAR_WEBINF_SET = new AntCopyUtils.FileSet()
16 years, 7 months
JBoss Tools SVN: r3865 - in trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core: validation and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2007-09-27 10:25:26 -0400 (Thu, 27 Sep 2007)
New Revision: 3865
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/SeamExpressionResolver.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamELValidator.java
Log:
http://jira.jboss.org/jira/browse/JBIDE-949 seam validator reports
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-09-27 14:06:55 UTC (rev 3864)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java 2007-09-27 14:25:26 UTC (rev 3865)
@@ -503,6 +503,7 @@
releaseChar();
return readMethodToken();
}
+ releaseChar();
return ELToken.EOF;
}
case STATE_VAR: // Variable name is read - expecting a separator
@@ -515,6 +516,7 @@
releaseChar();
return readSeparatorToken();
}
+ releaseChar();
return ELToken.EOF;
}
case STATE_METHOD: // Method name and parameters are read - expecting a separator
@@ -527,6 +529,7 @@
releaseChar();
return readSeparatorToken();
}
+ releaseChar();
return ELToken.EOF;
}
case STATE_SEPARATOR: // Separator is read - expecting a var or method
@@ -543,6 +546,7 @@
releaseChar();
return readMethodToken();
}
+ releaseChar();
return ELToken.EOF;
}
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamExpressionResolver.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamExpressionResolver.java 2007-09-27 14:06:55 UTC (rev 3864)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamExpressionResolver.java 2007-09-27 14:25:26 UTC (rev 3865)
@@ -172,14 +172,13 @@
Set<IMember> methods = new HashSet<IMember>();
if (type != null) {
try {
- IMethod[] mthds = type.getMethods();
+ IMethod[] mthds = getAllMethods(type);
for (int i = 0; mthds != null && i < mthds.length; i++) {
- IMethod m = mthds[i];
- if (Modifier.isPublic(m.getFlags()) &&
- !m.isConstructor() &&
- (!m.getElementName().startsWith("get") && !m.getElementName().startsWith("set")) ||
- "get".equals(m.getElementName()) || "set".equals(m.getElementName())) {
- methods.add(m);
+ if (Modifier.isPublic(mthds[i].getFlags()) &&
+ !mthds[i].isConstructor() &&
+ (!mthds[i].getElementName().startsWith("get") && !mthds[i].getElementName().startsWith("set")) ||
+ "get".equals(mthds[i].getElementName()) || "set".equals(mthds[i].getElementName())) {
+ methods.add(mthds[i]);
}
}
} catch (JavaModelException e) {
@@ -257,7 +256,34 @@
}
return result.toArray(new IMethod[result.size()]);
}
+
+ /**
+ * @param type
+ * @return fields of type and fields of all super classes
+ */
+ private static IField[] getAllFields(IType type) {
+ ArrayList<IField> result = new ArrayList<IField>();
+ try {
+ IField[] fields = type.getFields();
+ for(int i=0; i<fields.length; i++) {
+ result.add(fields[i]);
+ }
+ IType superType = getSuperclass(type);
+ while(superType!=null) {
+ fields = superType.getFields();
+ for(int i=0; i<fields.length; i++) {
+ result.add(fields[i]);
+ }
+ superType = getSuperclass(superType);
+ }
+ } catch (JavaModelException e) {
+ SeamCorePlugin.getPluginLog().logError(e);
+ }
+ return result.toArray(new IField[result.size()]);
+ }
+
+
private static IType getSuperclass(IType type) throws JavaModelException {
String superclassName = type.getSuperclassName();
if(superclassName!=null) {
@@ -280,13 +306,12 @@
Set<IMember> properties = new HashSet<IMember>();
if (type != null) {
try {
- IMethod[] props = type.getMethods();
- for (int i = 0; props != null && i < props.length; i++) {
- IMethod m = props[i];
- if (Modifier.isPublic(m.getFlags()) &&
- (m.getElementName().startsWith("get") && !"get".equals(m.getElementName())) ||
- (m.getElementName().startsWith("set") && !"set".equals(m.getElementName()))) {
- properties.add(m);
+ IMethod[] mthds = getAllMethods(type);
+ for (int i = 0; mthds != null && i < mthds.length; i++) {
+ if (Modifier.isPublic(mthds[i].getFlags()) &&
+ (mthds[i].getElementName().startsWith("get") && !"get".equals(mthds[i].getElementName())) ||
+ (mthds[i].getElementName().startsWith("set") && !"set".equals(mthds[i].getElementName()))) {
+ properties.add(mthds[i]);
}
}
} catch (JavaModelException e) {
@@ -294,7 +319,7 @@
}
try {
- IField[] fields = type.getFields();
+ IField[] fields = getAllFields(type);
for (int i = 0; fields != null && i < fields.length; i++) {
IField f = fields[i];
if (Modifier.isPublic(f.getFlags())) {
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamELValidator.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamELValidator.java 2007-09-27 14:06:55 UTC (rev 3864)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamELValidator.java 2007-09-27 14:25:26 UTC (rev 3865)
@@ -242,8 +242,9 @@
String prefix = SeamELCompletionEngine.getPrefix(exp, offset);
if(prefix!=null) {
- int possition = 0;
-
+ int possition = exp.indexOf(prefix);
+ if (possition == -1) possition = 0;
+
Set<ISeamContextVariable> usedVariables = new HashSet<ISeamContextVariable>();
Map<String, IMethod> unpairedGettersOrSetters = new HashMap<String, IMethod>();
16 years, 7 months
JBoss Tools SVN: r3864 - trunk/hibernatetools/features/org.hibernate.eclipse.feature.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2007-09-27 10:06:55 -0400 (Thu, 27 Sep 2007)
New Revision: 3864
Modified:
trunk/hibernatetools/features/org.hibernate.eclipse.feature/feature.xml
Log:
rhds-93
Modified: trunk/hibernatetools/features/org.hibernate.eclipse.feature/feature.xml
===================================================================
--- trunk/hibernatetools/features/org.hibernate.eclipse.feature/feature.xml 2007-09-27 13:54:29 UTC (rev 3863)
+++ trunk/hibernatetools/features/org.hibernate.eclipse.feature/feature.xml 2007-09-27 14:06:55 UTC (rev 3864)
@@ -496,4 +496,16 @@
version="0.0.0"
unpack="false"/>
+ <plugin
+ id="org.jboss.tools.hibernate.ui.veditor"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.hibernate.ui.view"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
</feature>
16 years, 7 months
JBoss Tools SVN: r3863 - trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2007-09-27 09:54:29 -0400 (Thu, 27 Sep 2007)
New Revision: 3863
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamFormWizardPage1.java
Log:
http://jira.jboss.org/jira/browse/JBIDE-966
validation restored
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamFormWizardPage1.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamFormWizardPage1.java 2007-09-27 13:41:53 UTC (rev 3862)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamFormWizardPage1.java 2007-09-27 13:54:29 UTC (rev 3863)
@@ -53,5 +53,6 @@
setDefaultValue(IParameter.SEAM_PAGE_NAME, valueL);
}
}
+ super.propertyChange(event);
}
}
16 years, 7 months