[jbosstools-commits] JBoss Tools SVN: r6054 - in trunk/seam/plugins/org.jboss.tools.seam.core: src/org/jboss/tools/seam/internal/core/validation and 1 other directory.

Author: dgolovin Date: 2008-01-31 01:24:45 -0500 (Thu, 31 Jan 2008) New Revision: 6054 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamRuntimeValidation.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamValidator.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/messages.properties Log: fix test errors Modified: trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml 2008-01-31 06:24:38 UTC (rev 6053) +++ trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml 2008-01-31 06:24:45 UTC (rev 6054) @@ -60,7 +60,7 @@ </requires> <requires facet="jst.java" - version="[5.0"> + version="5.0"> </requires> </and> </constraint> @@ -80,7 +80,7 @@ </requires> <requires facet="jst.java" - version="[5.0"> + version="5.0"> </requires> </and> </constraint> Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamRuntimeValidation.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamRuntimeValidation.java 2008-01-31 06:24:38 UTC (rev 6053) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamRuntimeValidation.java 2008-01-31 06:24:45 UTC (rev 6054) @@ -25,7 +25,8 @@ * @author Viacheslav Kabanovich */ public class SeamRuntimeValidation { - static final String TYPE = "org.jboss.tools.seam.core.seamProblem"; + + public static final String MARKER_TYPE = "org.jboss.tools.seam.core.seamProblem"; static final String ATTR_KIND = "kind"; static final String RUNTIME_KIND = "SeamRuntimeProblem"; @@ -52,7 +53,7 @@ } private IMarker findErrorMarker(ISeamProject project) throws CoreException { - IMarker[] ms = project.getProject().findMarkers(TYPE, true, IResource.DEPTH_ZERO); + IMarker[] ms = project.getProject().findMarkers(MARKER_TYPE, true, IResource.DEPTH_ZERO); if(ms == null) return null; for (int i = 0; i < ms.length; i++) { int s = ms[i].getAttribute(IMarker.SEVERITY, IMarker.SEVERITY_ERROR); @@ -85,7 +86,7 @@ } private void doCreateMarker(ISeamProject project, String message) throws CoreException { - IMarker marker = project.getProject().createMarker(TYPE); + IMarker marker = project.getProject().createMarker(MARKER_TYPE); marker.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_WARNING); marker.setAttribute(IMarker.MESSAGE, message); marker.setAttribute(ATTR_KIND, RUNTIME_KIND); Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamValidator.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamValidator.java 2008-01-31 06:24:38 UTC (rev 6053) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamValidator.java 2008-01-31 06:24:45 UTC (rev 6054) @@ -32,6 +32,9 @@ */ public abstract class SeamValidator implements ISeamValidator { + public static final String BASE_NAME + = "org.jboss.tools.seam.internal.core.validation.messages"; //$NON-NLS-1$ + IStatus OK_STATUS = new Status(IStatus.OK, "org.eclipse.wst.validation", 0, "OK", null); //$NON-NLS-1$ //$NON-NLS-2$ @@ -54,7 +57,7 @@ } protected String getBaseName() { - return "org.jboss.tools.seam.internal.core.validation.messages"; //$NON-NLS-1$ + return BASE_NAME; } protected void addError(String messageId, String preferenceKey, Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/messages.properties =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/messages.properties 2008-01-31 06:24:38 UTC (rev 6053) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/messages.properties 2008-01-31 06:24:45 UTC (rev 6054) @@ -9,7 +9,7 @@ #* Red Hat, Inc. - initial API and implementation #******************************************************************************/ #Components -NONUNIQUE_COMPONENT_NAME_MESSAGE=Duplicate component name: {0} +NONUNIQUE_COMPONENT_NAME_MESSAGE=Duplicate component name: "{0}" STATEFUL_COMPONENT_DOES_NOT_CONTAIN_REMOVE=Stateful component "{0}" must have a method marked @Remove STATEFUL_COMPONENT_DOES_NOT_CONTAIN_DESTROY=Stateful component "{0}" must have a method marked @Destroy STATEFUL_COMPONENT_WRONG_SCOPE=Stateful component "{0}" should not have org.jboss.seam.ScopeType.PAGE, nor org.jboss.seam.ScopeType.STATELESS @@ -34,15 +34,15 @@ #Bijections MULTIPLE_DATA_BINDER=@DataModelSelection and @DataModelSelectionIndex without name of the DataModel requires the only one @DataModel in the component -UNKNOWN_DATA_MODEL=Unknown @DataModel/@Out name: {0} +UNKNOWN_DATA_MODEL=Unknown @DataModel/@Out name: "{0}" #Context variables -DUPLICATE_VARIABLE_NAME=Duplicate variable name: {0} -UNKNOWN_VARIABLE_NAME=Unknown context variable name: {0} +DUPLICATE_VARIABLE_NAME=Duplicate variable name: "{0}" +UNKNOWN_VARIABLE_NAME=Unknown context variable name: "{0}" #Seam Expression language -UNKNOWN_EL_VARIABLE_NAME={0} cannot be resolved -UNKNOWN_EL_VARIABLE_PROPERTY_NAME={0} cannot be resolved +UNKNOWN_EL_VARIABLE_NAME="{0}" cannot be resolved +UNKNOWN_EL_VARIABLE_PROPERTY_NAME="{0}" cannot be resolved UNPAIRED_GETTER_OR_SETTER=Property "{0}" has only {1}. {2} is missing. #Messages for Progress Monitor