Fix preference category id; refactor one class to internal
diff --git a/bundles/org.eclipse.wst.xsd.ui/plugin.xml b/bundles/org.eclipse.wst.xsd.ui/plugin.xml
index 5295c54..3209a6b 100644
--- a/bundles/org.eclipse.wst.xsd.ui/plugin.xml
+++ b/bundles/org.eclipse.wst.xsd.ui/plugin.xml
@@ -102,7 +102,7 @@
<extension point="org.eclipse.ui.preferencePages">
<page
name="%_UI_XML_SCHEMA_PREFERENCE"
- category="org.eclipse.wst.sse.ui.preferences"
+ category="org.eclipse.wst.sse.ui.internal.provisional.preferences"
class="org.eclipse.wst.xsd.ui.internal.preferences.XSDPreferencePage"
id="org.eclipse.wst.xsd.ui.internal.preferences.XSDPreferencePage">
</page>
@@ -210,8 +210,8 @@
point="org.eclipse.wst.sse.ui.sourcevalidation">
<validator
scope="total"
- class="org.eclipse.wst.xsd.ui.reconcile.DelegatingSourceValidatorForXSD"
- id="org.eclipse.wst.xsd.ui.reconcile.DelegatingSourceValidatorForXSD">
+ class="org.eclipse.wst.xsd.ui.internal.validation.DelegatingSourceValidatorForXSD"
+ id="org.eclipse.wst.xsd.ui.internal.validation.DelegatingSourceValidatorForXSD">
<contentTypeIdentifier
id="org.eclipse.wst.xsd.contentmodel.xsdsource">
<partitionType
diff --git a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/validation/DelegatingSourceValidatorForXSD.java b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/validation/DelegatingSourceValidatorForXSD.java
new file mode 100644
index 0000000..55b1b89
--- /dev/null
+++ b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/validation/DelegatingSourceValidatorForXSD.java
@@ -0,0 +1,41 @@
+/*******************************************************************************
+ * Copyright (c) 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.xsd.ui.internal.validation;
+
+import org.eclipse.wst.validation.internal.provisional.ValidationFactory;
+import org.eclipse.wst.validation.internal.provisional.core.IValidator;
+import org.eclipse.wst.xml.ui.internal.validation.DelegatingSourceValidator;
+
+/**
+ * This performs the as-you-type validation
+ * @author Mark Hutchinson
+ *
+ */
+public class DelegatingSourceValidatorForXSD extends DelegatingSourceValidator
+{
+
+ final private static String VALIDATOR_CLASS = "org.eclipse.wst.xsd.validation.internal.ui.eclipse.Validator";
+
+ public DelegatingSourceValidatorForXSD()
+ { super();
+ }
+
+ protected IValidator getDelegateValidator()
+ {
+ try
+ { return ValidationFactory.instance.getValidator(VALIDATOR_CLASS);
+ }
+ catch (Exception e)
+ { //
+ }
+ return null;
+ }
+}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/reconcile/DelegatingSourceValidatorForXSD.java b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/reconcile/DelegatingSourceValidatorForXSD.java
deleted file mode 100644
index 32104d5..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/reconcile/DelegatingSourceValidatorForXSD.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Created on Feb 10, 2005
- */
-package org.eclipse.wst.xsd.ui.reconcile;
-
-import org.eclipse.wst.validation.internal.provisional.ValidationFactory;
-import org.eclipse.wst.validation.internal.provisional.core.IValidator;
-import org.eclipse.wst.xml.ui.internal.validation.DelegatingSourceValidator;
-
-/**
- * @author mhutchin
- *
- */
-public class DelegatingSourceValidatorForXSD extends DelegatingSourceValidator
-{
-
- final private static String VALIDATOR_CLASS = "org.eclipse.wst.xsd.validation.internal.ui.eclipse.Validator";
-
- public DelegatingSourceValidatorForXSD()
- { super();
- }
-
- protected IValidator getDelegateValidator()
- {
- try
- {
- return ValidationFactory.instance.getValidator(VALIDATOR_CLASS);
- }
- catch (Exception e)
- { //
- }
- return null;
- }
-}