[125365] Moved XSD validation UI strings from core to UI plug-in. Removed dependency on core plugin object from XSD validate action.
diff --git a/bundles/org.eclipse.wst.xsd.core/plugin.properties b/bundles/org.eclipse.wst.xsd.core/plugin.properties
index 35666bf..fb668cb 100644
--- a/bundles/org.eclipse.wst.xsd.core/plugin.properties
+++ b/bundles/org.eclipse.wst.xsd.core/plugin.properties
@@ -16,21 +16,4 @@
_UI_PLUGIN_NAME = XSD Core Plugin
XSD_Content_Type=XSD
-!
-! XSDEditor Menu bar contributor
-!
-
-_UI_MENU_VALIDATE_XML = &Validate XML Schema
-
-!
-! Validate Schema
-!
-_UI_DIALOG_XML_SCHEMA_INVALID_TITLE = Validation Failed
-_UI_DIALOG_XML_SCHEMA_VALID_TITLE = Validation Succeeded
-_UI_DIALOG_XML_SCHEMA_VALID_TEXT = The XML schema file is valid.
-_UI_DIALOG_XML_SCHEMA_VALID_WITH_WARNINGS = The XML schema file is valid however warnings have been issued. See the Problems view for the warning messages.
-_UI_DIALOG_XML_SCHEMA_INVALID_TEXT = The XML schema file is not valid. See the Problems view for the error messages.
-_UI_DIALOG_XML_SCHEMA_LIMITE_EXCEEDED = The XML schema file is not valid. The message limit for the Problems view has been exceeded. To see all the messages increase the limit and validate again.
-
-
_UI_XML_SCHEMA_VALIDATOR = XML Schema Validator
diff --git a/bundles/org.eclipse.wst.xsd.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.xsd.ui/META-INF/MANIFEST.MF
index 1bc811e..759a0f1 100644
--- a/bundles/org.eclipse.wst.xsd.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.wst.xsd.ui/META-INF/MANIFEST.MF
@@ -64,5 +64,5 @@
org.eclipse.ltk.ui.refactoring,
org.eclipse.wst.xsd.core,
org.eclipse.search
-Eclipse-AutoStart: true
+Eclipse-LazyStart: true
Plugin-Class: org.eclipse.wst.xsd.ui.internal.XSDEditorPlugin
diff --git a/bundles/org.eclipse.wst.xsd.ui/plugin.properties b/bundles/org.eclipse.wst.xsd.ui/plugin.properties
index 01944f1..dc01a76 100644
--- a/bundles/org.eclipse.wst.xsd.ui/plugin.properties
+++ b/bundles/org.eclipse.wst.xsd.ui/plugin.properties
@@ -514,10 +514,11 @@
!
! Validate Schema
!
-_UI_DIALOG_XML_SCHEMA_INVALID_TITLE = Validation Failed
-_UI_DIALOG_XML_SCHEMA_VALID_TITLE = Validation Succeeded
-_UI_DIALOG_XML_SCHEMA_VALID_TEXT = The XML schema file is valid.
-_UI_DIALOG_XML_SCHEMA_LIMITE_EXCEEDED = The XML schema file is not valid. The message limit for the Tasks view has been exceeded. Please increase the limit and try again.
+_UI_DIALOG_XML_SCHEMA_INVALID_TITLE = Validation Failed
+_UI_DIALOG_XML_SCHEMA_VALID_TITLE = Validation Succeeded
+_UI_DIALOG_XML_SCHEMA_VALID_TEXT = The XML schema file is valid.
+_UI_DIALOG_XML_SCHEMA_VALID_WITH_WARNINGS = The XML schema file is valid however warnings have been issued. See the Problems view for the warning messages.
+_UI_DIALOG_XML_SCHEMA_INVALID_TEXT = The XML schema file is not valid. See the Problems view for the error messages.
!
! Combo-box choices
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-validation/org/eclipse/wst/xsd/ui/internal/validation/ValidateAction.java b/bundles/org.eclipse.wst.xsd.ui/src-validation/org/eclipse/wst/xsd/ui/internal/validation/ValidateAction.java
index f6f85a1..a489005 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-validation/org/eclipse/wst/xsd/ui/internal/validation/ValidateAction.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-validation/org/eclipse/wst/xsd/ui/internal/validation/ValidateAction.java
@@ -22,6 +22,7 @@
import org.eclipse.wst.validation.internal.provisional.core.IMessage;
import org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage;
import org.eclipse.wst.xml.core.internal.validation.core.ValidationReport;
+import org.eclipse.wst.xsd.ui.internal.XSDEditorPlugin;
@@ -113,8 +114,8 @@
{
if (!valoutcome.isValid)
{
- String message = XSDValidatorManager.getString(_UI_DIALOG_XML_SCHEMA_INVALID_TEXT);
- String title = XSDValidatorManager.getString(_UI_DIALOG_XML_SCHEMA_INVALID_TITLE);
+ String message = XSDEditorPlugin.getXSDString(_UI_DIALOG_XML_SCHEMA_INVALID_TEXT);
+ String title = XSDEditorPlugin.getXSDString(_UI_DIALOG_XML_SCHEMA_INVALID_TITLE);
if (internalErrorMessage != null)
{
message = message + "\n" + internalErrorMessage;
@@ -123,14 +124,14 @@
}
else if (valoutcome.isValid && valoutcome.hasMessages)
{
- String message = XSDValidatorManager.getString(_UI_DIALOG_XML_SCHEMA_VALID_WITH_WARNINGS);
- String title = XSDValidatorManager.getString(_UI_DIALOG_XML_SCHEMA_VALID_TITLE);
+ String message = XSDEditorPlugin.getXSDString(_UI_DIALOG_XML_SCHEMA_VALID_WITH_WARNINGS);
+ String title = XSDEditorPlugin.getXSDString(_UI_DIALOG_XML_SCHEMA_VALID_TITLE);
openWarningDialog(title, message);
}
else
{
- String message = XSDValidatorManager.getString(_UI_DIALOG_XML_SCHEMA_VALID_TEXT);
- String title = XSDValidatorManager.getString(_UI_DIALOG_XML_SCHEMA_VALID_TITLE);
+ String message = XSDEditorPlugin.getXSDString(_UI_DIALOG_XML_SCHEMA_VALID_TEXT);
+ String title = XSDEditorPlugin.getXSDString(_UI_DIALOG_XML_SCHEMA_VALID_TITLE);
//String message = validator.isGrammarEncountered() ?
// XSDValidatorManager.getString("_UI_THE_XML_FILE_IS_VALID") :
// XSDValidatorManager.getString("_UI_THE_XML_FILE_IS_WELL_FORMED") +
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-validation/org/eclipse/wst/xsd/ui/internal/validation/XSDValidatorManager.java b/bundles/org.eclipse.wst.xsd.ui/src-validation/org/eclipse/wst/xsd/ui/internal/validation/XSDValidatorManager.java
deleted file mode 100644
index d19ad1c..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-validation/org/eclipse/wst/xsd/ui/internal/validation/XSDValidatorManager.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 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 java.io.IOException;
-import java.net.URL;
-import java.text.MessageFormat;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IPluginDescriptor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.wst.xsd.core.internal.XSDCorePlugin;
-
-public class XSDValidatorManager extends AbstractUIPlugin
-{
- protected static XSDValidatorManager plugin;
-
- public XSDValidatorManager(IPluginDescriptor descriptor)
- {
- super(descriptor);
- plugin = this;
-
- }
-
- /**
- * Copy the w3c XMLSchema.dtd and datatypes.dtd into the plugin metadata directory
- * for validation purposes
- */
- public void startup()
- {
- //ModelManagerPlugin plugin = (ModelManagerPlugin) Platform.getPlugin(ModelManagerPlugin.ID);
- //modelManager = plugin.getModelManager();
- }
-
- //private static ModelManager modelManager;
- //public static ModelManager getModelManager()
- //{
- // return modelManager;
- //}
-
- /**
- * Get the Install URL
- */
- public static URL getInstallURL()
- {
- return XSDCorePlugin.getDefault().getDescriptor().getInstallURL();
- }
-
- /**
- * Return the plugin physical directory location
- */
- public static IPath getPluginLocation()
- {
- try
- {
- IPath installPath = new Path(getInstallURL().toExternalForm()).removeTrailingSeparator();
- String installStr = Platform.asLocalURL(new URL(installPath.toString())).getFile();
- return new Path(installStr);
- }
- catch (IOException e)
- {
-
- }
- return null;
- }
-
- /**
- * Get the metadata directory for this plugin
- */
- //public static String getMetaDataDirectory()
- //{
- // return getPlugin().getStateLocation().toOSString();
- //}
-
- /**
- * Get the one xmlschema package.
- */
-// public XMLSchemaPackage getXMLSchemaPackage()
-// {
-// return xmlschemaPackage;
-// }
-
-// /**
-// * Get the one xmlschema factory.
-// */
-// public XMLSchemaFactory getXMLSchemaFactory()
-// {
-// return (XMLSchemaFactory)xmlschemaPackage.getEFactoryInstance();
-// }
-
- /**
- * Get the singleton instance.
- */
- public static XSDValidatorManager getInstance()
- {
- return plugin;
- }
-
-
- //public static Image getXSDImage(String iconName)
- //{
- // return getPlugin().getImage(iconName);
- //}
-
- /**
- * Get resource string
- */
- public static String getString(String key)
- {
- return XSDCorePlugin.getDefault().getDescriptor().getResourceBundle().getString(key);
- }
-
- /**
- * Get resource string
- */
- public static String getString(String key, String arg0)
- {
- return MessageFormat.format(getString(key), new Object [] { arg0 });
- }
-
- /**
- * Get resource string
- */
- public static String getString(String key, String arg0, String arg1)
- {
- return MessageFormat.format(getString(key), new Object [] { arg0, arg1 });
- }
- public IWorkspace getWorkspace()
- {
- return ResourcesPlugin.getWorkspace();
- }
-
- //public static Shell getShell()
- //{
- // return getPlugin().getWorkbench().getActiveWorkbenchWindow().getShell();
- //}
-
- /**
- * Get the xml schema default namespace prefix
- */
- //public String getXMLSchemaPrefix()
- //{
- // return getPreferenceStore().getString(CONST_XSD_DEFAULT_PREFIX_TEXT);
- //}
-
- /**
- * Get the xml schema language qualification
- */
- //public boolean isQualifyXMLSchemaLanguage()
- //{
- // return getPreferenceStore().getBoolean(CONST_XSD_LANGUAGE_QUALIFY);
- //}
-
-
-
- public static final String CONST_XSD_DEFAULT_PREFIX_TEXT = "org.eclipse.wst.xmlschema.xsdDefaultPrefixText";
- public static final String CONST_XSD_LANGUAGE_QUALIFY = "org.eclipse.wst.xmlschema.xsdQualify";
-
-
-}