[103767] remove broken pre-creation validation code
diff --git a/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/XMLImportActionDelegate.java b/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/XMLImportActionDelegate.java
index 9b11b69..932dd24 100644
--- a/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/XMLImportActionDelegate.java
+++ b/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/XMLImportActionDelegate.java
@@ -10,36 +10,22 @@
*******************************************************************************/
package org.eclipse.wst.xml.ui.internal.wizards;
-import java.io.InputStream;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
import java.util.Iterator;
-
import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Platform;
import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.IActionDelegate;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.common.uriresolver.internal.util.URIHelper;
-import org.osgi.framework.Bundle;
+// TODO cs... rename this class NewXMLActionDelegate
+// we need to re-add pre-validation using the validation framework API's
+// since we also need to add validation to the 'New XML' case, this prevalidation
+// function should really go into the NewWizard somewhere
+//
public class XMLImportActionDelegate implements IActionDelegate
-{
- private static final String validateXSDPluginID = "org.eclipse.wst.xsd.validation"; //$NON-NLS-1$
- private static final String xsdValidatorClassName = "org.eclipse.wst.xsd.validation.internal.ui.eclipse.XSDValidator"; //$NON-NLS-1$
-
- private static final String validateDTDPluginID = "org.eclipse.wst.dtd.validation"; //$NON-NLS-1$
- private static final String dtdValidatorClassName = "org.eclipse.wst.dtd.validation.internal.ui.eclipse.DTDValidator"; //$NON-NLS-1$
-
- private static final String validationReportClassName = "org.eclipse.wst.xml.validation.internal.core.ValidationReport"; //$NON-NLS-1$
-
-
+{
/**
* Checks the current selection and runs the separate browser
* to show the content of the Readme file. This code shows how
@@ -56,122 +42,15 @@
if (selectedObject instanceof IFile && selection instanceof IStructuredSelection)
{
IFile file = (IFile)selectedObject;
- IStructuredSelection structuredSelection = (IStructuredSelection)selection;
-
- if (file.getName().endsWith(".dtd") || file.getName().endsWith(".xsd")) //$NON-NLS-1$ //$NON-NLS-2$
- {
- IPath path = file.getLocation();
- String uri = URIHelper.getURIForFilePath(path.toString());
-
- boolean validationPluginsFound = false;
-
- Boolean isValid = null;
-
- try
- {
- if (file.getName().endsWith(".xsd")) //$NON-NLS-1$
- {
- Class[] parameterTypes = new Class[] {String.class, InputStream.class};
- Object[] arguments = new Object[] {uri, null};
-
-// Here is the Reflection equivalent way of performing the following lines
-// XSDValidator xsdValidator = XSDValidator.getInstance();
-// ValidationReport valreport = xsdValidator.validate(uri);
-
- Bundle validateXSDBundle = Platform.getBundle(validateXSDPluginID);
- if (validateXSDBundle != null)
- {
- Class xsdValidatorClass, validationReportClass;
- Object xsdValidatorObject, validationReportObject;
-
- xsdValidatorClass = validateXSDBundle.loadClass(xsdValidatorClassName);
-
- Method getInstanceMethod = xsdValidatorClass.getMethod("getInstance", null); //$NON-NLS-1$
- xsdValidatorObject = getInstanceMethod.invoke(null, null); // static and no parameters
-
- Method validateMethod = xsdValidatorClass.getMethod("validate", parameterTypes); //$NON-NLS-1$
- validationReportObject = validateMethod.invoke(xsdValidatorObject, arguments);
-
- validationReportClass = validateXSDBundle.loadClass(validationReportClassName);
-
- Method isValidMethod = validationReportClass.getMethod("isValid", null); //$NON-NLS-1$
- isValid = (Boolean)isValidMethod.invoke(validationReportObject, null);
-
- validationPluginsFound = true; // made it this far, so declare that validation can be performed
- }
- }
- else
- {
- Class[] parameterTypes = new Class[] {String.class};
- Object[] arguments = new Object[] {uri};
-
-// Here is the Reflection equivalent way of performing the following lines
-// DTDValidator dtdValidator = DTDValidator.getInstance();
-// ValidationReport valreport = dtdValidator.validate(uri);
-
- Bundle validateDTDBundle = Platform.getBundle(validateDTDPluginID);
-
- if (validateDTDBundle != null)
- {
- Class dtdValidatorClass, validationReportClass;
- Object dtdValidatorObject, validationReportObject;
-
- dtdValidatorClass = validateDTDBundle.loadClass(dtdValidatorClassName);
-
- Method getInstanceMethod = dtdValidatorClass.getMethod("getInstance", null); //$NON-NLS-1$
- dtdValidatorObject = getInstanceMethod.invoke(null, null); // static and no parameters
-
- Method validateMethod = dtdValidatorClass.getMethod("validate", parameterTypes); //$NON-NLS-1$
- validationReportObject = validateMethod.invoke(dtdValidatorObject, arguments);
-
- validationReportClass = validateDTDBundle.loadClass(validationReportClassName);
-
- Method isValidMethod = validationReportClass.getMethod("isValid", null); //$NON-NLS-1$
- isValid = (Boolean)isValidMethod.invoke(validationReportObject, null);
-
- validationPluginsFound = true; // made it this far, so declare that validation can be performed
- }
- }
- }
- catch (ClassNotFoundException e)
- {
- // Plugins Not Found
- }
- catch (NoSuchMethodException e)
- {
- // Plugins Not Found
- }
- catch (IllegalAccessException e)
- {
- // Plugins Not Found
- }
- catch (InvocationTargetException e)
- {
- // Plugins Not Found
- }
-
- if (validationPluginsFound)
- {
- if (isValid != null && !isValid.booleanValue())
- {
- String title = XMLWizardsMessages._UI_DIALOG_TITLE_INVALID_GRAMMAR;
- String message = XMLWizardsMessages._UI_DIALOG_MESSAGE_INVALID_GRAMMAR;
- boolean answer = MessageDialog.openQuestion(Display.getDefault().getActiveShell(), title, message);
- if (!answer)
- return;
- }
- }
- else
- {
- // TODO externalize these strings
- String title = XMLWizardsMessages.Validation_Plugins_Unavailable;
- String message = XMLWizardsMessages.Validation_cannot_be_performed;
- boolean answer = MessageDialog.openQuestion(Display.getDefault().getActiveShell(), title, message);
- if (!answer)
- return;
- }
+ IStructuredSelection structuredSelection = (IStructuredSelection)selection;
+ try
+ {
NewXMLWizard.showDialog(workbenchWindow.getShell(), file, structuredSelection);
}
+ catch (Exception e)
+ {
+ //XMLCorePlugin.getDefault().getLog().log();
+ }
}
}
@@ -203,5 +82,5 @@
}
}
return result;
- }
+ }
}
