[528191] Replace uses of org.eclipse.jface.util.Assert and
org.eclipse.jface.text.Assert because of their deletion.
diff --git a/xml/bundles/org.eclipse.wst.dtd.ui/src-properties/org/eclipse/wst/dtd/ui/internal/properties/section/AbstractSection.java b/xml/bundles/org.eclipse.wst.dtd.ui/src-properties/org/eclipse/wst/dtd/ui/internal/properties/section/AbstractSection.java
index a0e6946..16c1395 100644
--- a/xml/bundles/org.eclipse.wst.dtd.ui/src-properties/org/eclipse/wst/dtd/ui/internal/properties/section/AbstractSection.java
+++ b/xml/bundles/org.eclipse.wst.dtd.ui/src-properties/org/eclipse/wst/dtd/ui/internal/properties/section/AbstractSection.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
+ * Copyright (c) 2006, 2020 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
@@ -13,8 +13,8 @@
*******************************************************************************/
package org.eclipse.wst.dtd.ui.internal.properties.section;
+import org.eclipse.core.runtime.Assert;
import org.eclipse.jface.action.IStatusLineManager;
-import org.eclipse.jface.util.Assert;
import org.eclipse.jface.util.IPropertyChangeListener;
import org.eclipse.jface.util.PropertyChangeEvent;
import org.eclipse.jface.viewers.ISelection;
diff --git a/xml/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/NamespaceInfoContentBuilder.java b/xml/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/NamespaceInfoContentBuilder.java
index a46a2e5..603fe61 100644
--- a/xml/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/NamespaceInfoContentBuilder.java
+++ b/xml/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/NamespaceInfoContentBuilder.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
+ * Copyright (c) 2001, 2020 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
@@ -12,9 +12,9 @@
*******************************************************************************/
package org.eclipse.wst.xml.ui.internal.wizards;
+import java.util.ArrayList;
import java.util.Hashtable;
import java.util.List;
-import java.util.Vector;
import org.eclipse.wst.xml.core.internal.contentmodel.CMAnyElement;
import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
@@ -23,8 +23,8 @@
public class NamespaceInfoContentBuilder extends ContentBuilder {
protected int count = 1;
- public List list = new Vector();
- protected Hashtable table = new Hashtable();
+ public List<NamespaceInfo> list = new ArrayList<>();
+ protected Hashtable<String, NamespaceInfo> table = new Hashtable<>();
public NamespaceInfoContentBuilder() {
super();
diff --git a/xml/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/NewXMLGenerator.java b/xml/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/NewXMLGenerator.java
index f75e76d..a5d3277 100644
--- a/xml/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/NewXMLGenerator.java
+++ b/xml/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/NewXMLGenerator.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2001, 2016 IBM Corporation and others.
+ * Copyright (c) 2001, 2020 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
@@ -18,6 +18,7 @@
import java.io.FileOutputStream;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
+import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Vector;
@@ -26,12 +27,12 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.ProjectScope;
+import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Preferences;
import org.eclipse.core.runtime.content.IContentType;
import org.eclipse.core.runtime.preferences.IScopeContext;
import org.eclipse.core.runtime.preferences.InstanceScope;
-import org.eclipse.jface.util.Assert;
import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolver;
import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolverPlugin;
import org.eclipse.wst.common.uriresolver.internal.util.URIHelper;
@@ -66,7 +67,7 @@
protected String defaultSystemId;
// info for xsd
- public List namespaceInfoList;
+ public List<NamespaceInfo> namespaceInfoList;
public NewXMLGenerator() {
super();
@@ -229,7 +230,7 @@
// TODO... instead of relying on file extensions, we need to keep
// track of the grammar type
- // better yet we should reate an SSE document so that we can format it
+ // better yet we should create an SSE document so that we can format it
// nicely before saving
// then we won't need the DOMWriter at all
//
@@ -242,14 +243,14 @@
public void createNamespaceInfoList() {
- List result = new Vector();
+ List<NamespaceInfo> result = new ArrayList<>();
if (cmDocument != null) {
- List result2 = (List) cmDocument.getProperty("http://org.eclipse.wst/cm/properties/completeNamespaceInfo"); //$NON-NLS-1$
+ List<NamespaceInfo> result2 = (List<NamespaceInfo>) cmDocument.getProperty("http://org.eclipse.wst/cm/properties/completeNamespaceInfo"); //$NON-NLS-1$
if (result2 != null) {
result = result2;
int size = result.size();
for (int i = 0; i < size; i++) {
- NamespaceInfo info = (NamespaceInfo) result.get(i);
+ NamespaceInfo info = result.get(i);
if (i == 0) {
String locationInfo = null;
if (xmlCatalogEntry != null) {
@@ -284,8 +285,8 @@
public boolean isMissingNamespaceLocation() {
boolean result = false;
- for (Iterator i = namespaceInfoList.iterator(); i.hasNext();) {
- NamespaceInfo info = (NamespaceInfo) i.next();
+ for (Iterator<NamespaceInfo> i = namespaceInfoList.iterator(); i.hasNext();) {
+ NamespaceInfo info = i.next();
if (info.locationHint == null) {
result = true;
break;
@@ -376,11 +377,11 @@
protected class MyExternalCMDocumentSupport implements DOMContentBuilderImpl.ExternalCMDocumentSupport {
- protected List namespaceInfoList1;
+ protected List<NamespaceInfo> namespaceInfoList1;
protected URIResolver idResolver;
protected String resourceLocation;
- protected MyExternalCMDocumentSupport(List namespaceInfoListParam, String resourceLocation) {
+ protected MyExternalCMDocumentSupport(List<NamespaceInfo> namespaceInfoListParam, String resourceLocation) {
this.namespaceInfoList1 = namespaceInfoListParam;
this.resourceLocation = resourceLocation;
idResolver = URIResolverPlugin.createResolver();
diff --git a/xml/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/NewXMLWizard.java b/xml/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/NewXMLWizard.java
index 2e0f51e..4244145 100644
--- a/xml/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/NewXMLWizard.java
+++ b/xml/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/NewXMLWizard.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2001, 2012 IBM Corporation and others.
+ * Copyright (c) 2001, 2020 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
@@ -15,12 +15,14 @@
import java.io.File;
import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Vector;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -30,7 +32,6 @@
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.util.Assert;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.wizard.IWizardPage;
import org.eclipse.jface.wizard.WizardDialog;
@@ -659,17 +660,17 @@
combo.removeAll();
if ((generator.getCMDocument() != null) && (cmDocumentErrorMessage == null)) {
CMNamedNodeMap nameNodeMap = generator.getCMDocument().getElements();
- Vector nameNodeVector = new Vector();
+ List<String> nameNodeList = new ArrayList<>();
for (int i = 0; i < nameNodeMap.getLength(); i++) {
CMElementDeclaration cmElementDeclaration = (CMElementDeclaration) nameNodeMap.item(i);
Object value = cmElementDeclaration.getProperty("Abstract"); //$NON-NLS-1$
if (value != Boolean.TRUE) {
- nameNodeVector.add(cmElementDeclaration.getElementName());
+ nameNodeList.add(cmElementDeclaration.getElementName());
}
}
- Object[] nameNodeArray = nameNodeVector.toArray();
+ String[] nameNodeArray = nameNodeList.toArray(new String[nameNodeList.size()]);
if (nameNodeArray.length > 0) {
Arrays.sort(nameNodeArray, Collator.getInstance());
}
@@ -677,7 +678,7 @@
String defaultRootName = (String) (generator.getCMDocument()).getProperty("http://org.eclipse.wst/cm/properties/defaultRootName"); //$NON-NLS-1$
int defaultRootIndex = -1;
for (int i = 0; i < nameNodeArray.length; i++) {
- String elementName = (String) nameNodeArray[i];
+ String elementName = nameNodeArray[i];
combo.add(elementName);
if ((defaultRootName != null) && defaultRootName.equals(elementName)) {
@@ -700,7 +701,7 @@
// Provide default namespace prefix if none
for (int i = 0; i < generator.namespaceInfoList.size(); i++) {
- NamespaceInfo nsinfo = (NamespaceInfo) generator.namespaceInfoList.get(i);
+ NamespaceInfo nsinfo = generator.namespaceInfoList.get(i);
if (((nsinfo.prefix == null) || (nsinfo.prefix.trim().length() == 0)) && ((nsinfo.uri != null) && (nsinfo.uri.trim().length() != 0))) {
nsinfo.prefix = getDefaultPrefix(generator.namespaceInfoList);
}
@@ -726,15 +727,15 @@
}
}
- private String getDefaultPrefix(List nsInfoList) {
+ private String getDefaultPrefix(List<NamespaceInfo> nsInfoList) {
String defaultPrefix = "p"; //$NON-NLS-1$
if (nsInfoList == null) {
return defaultPrefix;
}
- Vector v = new Vector();
+ Vector<String> v = new Vector<>();
for (int i = 0; i < nsInfoList.size(); i++) {
- NamespaceInfo nsinfo = (NamespaceInfo) nsInfoList.get(i);
+ NamespaceInfo nsinfo = nsInfoList.get(i);
if (nsinfo.prefix != null) {
v.addElement(nsinfo.prefix);
}
diff --git a/xml/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/ADTEditPartFactory.java b/xml/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/ADTEditPartFactory.java
index 5590c62..9b6c39e 100644
--- a/xml/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/ADTEditPartFactory.java
+++ b/xml/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/ADTEditPartFactory.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
+ * Copyright (c) 2001, 2020 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
@@ -12,10 +12,10 @@
*******************************************************************************/
package org.eclipse.wst.xsd.ui.internal.adt.design.editparts;
+import org.eclipse.core.runtime.Assert;
import org.eclipse.draw2d.ToolbarLayout;
import org.eclipse.gef.EditPart;
import org.eclipse.gef.EditPartFactory;
-import org.eclipse.jface.util.Assert;
import org.eclipse.wst.xsd.ui.internal.adt.design.ADTFloatingToolbar.ADTFloatingToolbarModel;
import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.model.AbstractModelCollection;
import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.model.Compartment;
diff --git a/xml/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/actions/SelectionDispatchAction.java b/xml/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/actions/SelectionDispatchAction.java
index aa5cee5..183594c 100644
--- a/xml/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/actions/SelectionDispatchAction.java
+++ b/xml/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/actions/SelectionDispatchAction.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
+ * Copyright (c) 2000, 2020 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
@@ -13,9 +13,9 @@
*******************************************************************************/
package org.eclipse.wst.xsd.ui.internal.refactor.actions;
+import org.eclipse.core.runtime.Assert;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.jface.util.Assert;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.IStructuredSelection;
diff --git a/xml/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/wizard/RefactorActionGroup.java b/xml/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/wizard/RefactorActionGroup.java
index 9c49352..557207c 100644
--- a/xml/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/wizard/RefactorActionGroup.java
+++ b/xml/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/wizard/RefactorActionGroup.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
+ * Copyright (c) 2001, 2020 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
@@ -14,13 +14,14 @@
import java.util.Iterator;
import java.util.List;
+
+import org.eclipse.core.runtime.Assert;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.action.IMenuListener;
import org.eclipse.jface.action.IMenuManager;
import org.eclipse.jface.action.MenuManager;
import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.util.Assert;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.ISelectionProvider;
diff --git a/xml/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/wizard/RenameInputWizardPage.java b/xml/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/wizard/RenameInputWizardPage.java
index 7dc0be7..e0ad1eb 100644
--- a/xml/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/wizard/RenameInputWizardPage.java
+++ b/xml/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/wizard/RenameInputWizardPage.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
+ * Copyright (c) 2000, 2020 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
@@ -13,10 +13,8 @@
*******************************************************************************/
package org.eclipse.wst.xsd.ui.internal.refactor.wizard;
-
-
+import org.eclipse.core.runtime.Assert;
import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.util.Assert;
import org.eclipse.ltk.core.refactoring.RefactoringStatus;
import org.eclipse.ltk.ui.refactoring.UserInputWizardPage;
import org.eclipse.swt.SWT;
diff --git a/xml/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/CompositeActionGroup.java b/xml/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/CompositeActionGroup.java
index 024e6f2..68dc5ce 100644
--- a/xml/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/CompositeActionGroup.java
+++ b/xml/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/CompositeActionGroup.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
+ * Copyright (c) 2000, 2020 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
@@ -13,8 +13,8 @@
// TODO... open a bugzilla to get the JDT class moved to non internal platform
package org.eclipse.wst.xsd.ui.internal.search.actions;
+import org.eclipse.core.runtime.Assert;
import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.util.Assert;
import org.eclipse.ui.IActionBars;
import org.eclipse.ui.actions.ActionContext;
diff --git a/xml/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/ReferencesSearchGroup.java b/xml/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/ReferencesSearchGroup.java
index 2e3c0c0..9b1be4b 100644
--- a/xml/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/ReferencesSearchGroup.java
+++ b/xml/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/ReferencesSearchGroup.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * Copyright (c) 2005, 2020 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
@@ -15,9 +15,9 @@
import java.util.List;
+import org.eclipse.core.runtime.Assert;
import org.eclipse.jface.action.IMenuManager;
import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.util.Assert;
import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.ui.IActionBars;
diff --git a/xml/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/XSDSearchActionGroup.java b/xml/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/XSDSearchActionGroup.java
index d6f06a9..8c301ec 100644
--- a/xml/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/XSDSearchActionGroup.java
+++ b/xml/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/XSDSearchActionGroup.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * Copyright (c) 2005, 2020 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
@@ -13,7 +13,7 @@
*******************************************************************************/
package org.eclipse.wst.xsd.ui.internal.search.actions;
-import org.eclipse.jface.util.Assert;
+import org.eclipse.core.runtime.Assert;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.actions.ActionGroup;
