changes for validation api - commit for vkb
diff --git a/tests/org.eclipse.jst.validation.sample/filesystemFWK/org/eclipse/wst/validation/sample/filesystem/FilesystemApplication.java b/tests/org.eclipse.jst.validation.sample/filesystemFWK/org/eclipse/wst/validation/sample/filesystem/FilesystemApplication.java index 26b6aa7..c0cf899 100644 --- a/tests/org.eclipse.jst.validation.sample/filesystemFWK/org/eclipse/wst/validation/sample/filesystem/FilesystemApplication.java +++ b/tests/org.eclipse.jst.validation.sample/filesystemFWK/org/eclipse/wst/validation/sample/filesystem/FilesystemApplication.java
@@ -21,11 +21,11 @@ import org.eclipse.wst.validation.core.IFileDelta; +import org.eclipse.wst.validation.core.IMessage; import org.eclipse.wst.validation.core.IReporter; -import org.eclipse.wst.validation.core.Message; -import org.eclipse.wst.validation.core.SeverityEnum; import org.eclipse.wst.validation.core.ValidationException; -import org.eclipse.wst.validation.core.ValidatorLauncher; +import org.eclispe.wst.validation.internal.core.Message; +import org.eclispe.wst.validation.internal.core.ValidatorLauncher; /** * This class is the representation of a file system based application @@ -58,7 +58,7 @@ } } catch (ValidationException exc) { - Message message = new Message("filesystem", SeverityEnum.HIGH_SEVERITY, "VFFS0000", new String[]{loader.getValidator().getClass().getName()}); //$NON-NLS-1$ //$NON-NLS-2$ + Message message = new Message("filesystem", IMessage.HIGH_SEVERITY, "VFFS0000", new String[]{loader.getValidator().getClass().getName()}); //$NON-NLS-1$ //$NON-NLS-2$ reporter.displaySubtask(loader.getValidator(), message); if(exc.getAssociatedMessage() != null) { @@ -72,7 +72,7 @@ // continue with the next validation } catch (Exception exc) { - Message message = new Message("filesystem", SeverityEnum.HIGH_SEVERITY, "VFFS0000", new String[]{loader.getValidator().getClass().getName()}); //$NON-NLS-1$ //$NON-NLS-2$ + Message message = new Message("filesystem", IMessage.HIGH_SEVERITY, "VFFS0000", new String[]{loader.getValidator().getClass().getName()}); //$NON-NLS-1$ //$NON-NLS-2$ reporter.displaySubtask(loader.getValidator(), message); // continue with the next validation exc.printStackTrace();
diff --git a/tests/org.eclipse.jst.validation.sample/filesystemFWK/org/eclipse/wst/validation/sample/filesystem/IncrementalReporter.java b/tests/org.eclipse.jst.validation.sample/filesystemFWK/org/eclipse/wst/validation/sample/filesystem/IncrementalReporter.java index 374cd24..1df04ef 100644 --- a/tests/org.eclipse.jst.validation.sample/filesystemFWK/org/eclipse/wst/validation/sample/filesystem/IncrementalReporter.java +++ b/tests/org.eclipse.jst.validation.sample/filesystemFWK/org/eclipse/wst/validation/sample/filesystem/IncrementalReporter.java
@@ -127,7 +127,7 @@ public void report() { System.out.println(); System.out.println("Error messages"); //$NON-NLS-1$ - Map messages = getMessages(SeverityEnum.HIGH_SEVERITY); + Map messages = getMessages(IMessage.HIGH_SEVERITY); report(messages); System.out.println();
diff --git a/tests/org.eclipse.jst.validation.sample/filesystemFWK/org/eclipse/wst/validation/sample/filesystem/MessageManager.java b/tests/org.eclipse.jst.validation.sample/filesystemFWK/org/eclipse/wst/validation/sample/filesystem/MessageManager.java index d842260..0f05d6d 100644 --- a/tests/org.eclipse.jst.validation.sample/filesystemFWK/org/eclipse/wst/validation/sample/filesystem/MessageManager.java +++ b/tests/org.eclipse.jst.validation.sample/filesystemFWK/org/eclipse/wst/validation/sample/filesystem/MessageManager.java
@@ -146,7 +146,7 @@ Object object = message.getTargetObject(); StringBuffer formattedMessage = new StringBuffer(); switch (severity) { - case (SeverityEnum.HIGH_SEVERITY) : + case (IMessage.HIGH_SEVERITY) : { formattedMessage.append("Error: "); //$NON-NLS-1$ break; @@ -170,7 +170,7 @@ if (object != null) { String fileName = FilesystemManager.getManager().getHelper(validator).getFileName(message); - int lineNumber = message.getLineNo(); + int lineNumber = message.getLineNumber(); if((fileName != null) || (lineNumber != IMessage.LINENO_UNSET)) { formattedMessage.append("["); //$NON-NLS-1$ @@ -244,8 +244,8 @@ return result; } - int aLineNumber = aMssg.getLineNo(); - int bLineNumber = bMssg.getLineNo(); + int aLineNumber = aMssg.getLineNumber(); + int bLineNumber = bMssg.getLineNumber(); return compare(aLineNumber, bLineNumber); } };
diff --git a/tests/org.eclipse.jst.validation.sample/propertiesValWB/org/eclipse/jst/validation/sample/workbenchimpl/PluginPropertyFile.java b/tests/org.eclipse.jst.validation.sample/propertiesValWB/org/eclipse/jst/validation/sample/workbenchimpl/PluginPropertyFile.java index 77dbe36..7cb03a7 100644 --- a/tests/org.eclipse.jst.validation.sample/propertiesValWB/org/eclipse/jst/validation/sample/workbenchimpl/PluginPropertyFile.java +++ b/tests/org.eclipse.jst.validation.sample/propertiesValWB/org/eclipse/jst/validation/sample/workbenchimpl/PluginPropertyFile.java
@@ -194,7 +194,7 @@ } public void report(IMessage message) { - MessageMetaData mmd = new MessageMetaData(message.getBundleName(), message.getSeverity(), message.getId(), message.getParams(), message.getTargetObject(), message.getLineNo(), message.getOffset(), message.getLength()); + MessageMetaData mmd = new MessageMetaData(message.getBundleName(), message.getSeverity(), message.getId(), message.getParams(), message.getTargetObject(), message.getLineNumber(), message.getOffset(), message.getLength()); addParseWarning(mmd); } @@ -203,7 +203,7 @@ } public void addParseWarning(IMessage message) { - MessageMetaData mmd = new MessageMetaData(message.getBundleName(), message.getSeverity(), message.getId(), message.getParams(), message.getTargetObject(), message.getLineNo(), message.getOffset(), message.getLength()); + MessageMetaData mmd = new MessageMetaData(message.getBundleName(), message.getSeverity(), message.getId(), message.getParams(), message.getTargetObject(), message.getLineNumber(), message.getOffset(), message.getLength()); addParseWarning(mmd); }
diff --git a/tests/org.eclipse.jst.validation.sample/propertiesValidator/org/eclipse/jst/validation/sample/PropertiesValidator.java b/tests/org.eclipse.jst.validation.sample/propertiesValidator/org/eclipse/jst/validation/sample/PropertiesValidator.java index 3b832f6..3c8f3b8 100644 --- a/tests/org.eclipse.jst.validation.sample/propertiesValidator/org/eclipse/jst/validation/sample/PropertiesValidator.java +++ b/tests/org.eclipse.jst.validation.sample/propertiesValidator/org/eclipse/jst/validation/sample/PropertiesValidator.java
@@ -28,9 +28,9 @@ import org.eclipse.wst.validation.core.IMessage; import org.eclipse.wst.validation.core.IReporter; import org.eclipse.wst.validation.core.IValidator; -import org.eclipse.wst.validation.core.Message; import org.eclipse.wst.validation.core.SeverityEnum; import org.eclipse.wst.validation.core.ValidationException; +import org.eclispe.wst.validation.internal.core.Message; import com.ibm.wtp.common.logger.proxy.Logger;
diff --git a/tests/org.eclipse.jst.validation.sample/propertiesValidator/org/eclipse/jst/validation/sample/ValidatorPropertyFile.java b/tests/org.eclipse.jst.validation.sample/propertiesValidator/org/eclipse/jst/validation/sample/ValidatorPropertyFile.java index a9a9e8e..9f28a0c 100644 --- a/tests/org.eclipse.jst.validation.sample/propertiesValidator/org/eclipse/jst/validation/sample/ValidatorPropertyFile.java +++ b/tests/org.eclipse.jst.validation.sample/propertiesValidator/org/eclipse/jst/validation/sample/ValidatorPropertyFile.java
@@ -26,7 +26,7 @@ import org.eclipse.wst.validation.core.IMessage; import org.eclipse.wst.validation.core.IReporter; import org.eclipse.wst.validation.core.IValidator; -import org.eclipse.wst.validation.core.Message; +import org.eclispe.wst.validation.internal.core.Message; /** * This class represents an APropertyFile that is instantiated by a validator. @@ -86,7 +86,7 @@ private static int getSeverity(int mmdSeverity) { switch(mmdSeverity) { case(MessageMetaData.ERROR): { - return IReporter.HIGH_SEVERITY; + return IMessage.HIGH_SEVERITY; } case(MessageMetaData.INFO): {
diff --git a/tests/org.eclipse.jst.validation.test/test/org/eclipse/jst/validation/test/internal/registry/TestSetupImport.java b/tests/org.eclipse.jst.validation.test/test/org/eclipse/jst/validation/test/internal/registry/TestSetupImport.java index eb60c1a..48da894 100644 --- a/tests/org.eclipse.jst.validation.test/test/org/eclipse/jst/validation/test/internal/registry/TestSetupImport.java +++ b/tests/org.eclipse.jst.validation.test/test/org/eclipse/jst/validation/test/internal/registry/TestSetupImport.java
@@ -7,7 +7,7 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jst.validation.test.BVTValidationPlugin; import org.eclipse.jst.validation.test.setup.IImportOperation; -import org.eclipse.wst.validation.internal.plugin.ValidationPlugin; +import org.eclipse.wst.validation.plugin.ValidationPlugin; import com.ibm.wtp.common.logger.LogEntry; import com.ibm.wtp.common.logger.proxy.Logger;
diff --git a/tests/org.eclipse.jst.validation.test/test/org/eclipse/jst/validation/test/internal/util/BVTRunner.java b/tests/org.eclipse.jst.validation.test/test/org/eclipse/jst/validation/test/internal/util/BVTRunner.java index 83313ca..4a2f0c1 100644 --- a/tests/org.eclipse.jst.validation.test/test/org/eclipse/jst/validation/test/internal/util/BVTRunner.java +++ b/tests/org.eclipse.jst.validation.test/test/org/eclipse/jst/validation/test/internal/util/BVTRunner.java
@@ -34,7 +34,7 @@ import org.eclipse.wst.validation.internal.operations.OneValidatorOperation; import org.eclipse.wst.validation.internal.operations.ValidationOperation; import org.eclipse.wst.validation.internal.operations.ValidatorManager; -import org.eclipse.wst.validation.internal.plugin.ValidationPlugin; +import org.eclipse.wst.validation.plugin.ValidationPlugin; import com.ibm.wtp.common.logger.LogEntry; import com.ibm.wtp.common.logger.proxy.Logger;
diff --git a/tests/org.eclipse.jst.validation.test/test/org/eclipse/jst/validation/test/setup/AImportOperation.java b/tests/org.eclipse.jst.validation.test/test/org/eclipse/jst/validation/test/setup/AImportOperation.java index 2253f54..7f73717 100644 --- a/tests/org.eclipse.jst.validation.test/test/org/eclipse/jst/validation/test/setup/AImportOperation.java +++ b/tests/org.eclipse.jst.validation.test/test/org/eclipse/jst/validation/test/setup/AImportOperation.java
@@ -11,7 +11,7 @@ import org.eclipse.jst.validation.test.BVTValidationPlugin; import org.eclipse.jst.validation.test.internal.util.BVTValidationUtility; import org.eclipse.wst.validation.internal.operations.ValidatorManager; -import org.eclipse.wst.validation.internal.plugin.ValidationPlugin; +import org.eclipse.wst.validation.plugin.ValidationPlugin; import com.ibm.wtp.common.logger.LogEntry; import com.ibm.wtp.common.logger.proxy.Logger;