[no bug] remove warnings that are now errors due to preference changes
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/actions/CreateElementAction.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/actions/CreateElementAction.java
index 0111043..b54c609 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/actions/CreateElementAction.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/actions/CreateElementAction.java
@@ -136,7 +136,7 @@
public void endRecording()
{
- DocumentImpl doc = (DocumentImpl) getDocument();
+ DocumentImpl doc = getDocument();
doc.getModel().endRecording(this);
}
@@ -161,7 +161,7 @@
}
else
{
- ((Element)parentNode).insertBefore(childNode,getRelativeNode());
+ parentNode.insertBefore(childNode,getRelativeNode());
}
if (isGlobal && getRelativeNode() == null)
@@ -228,7 +228,7 @@
}
else if (comp.getContainer().getContainer() instanceof XSDComplexTypeDefinition)
{
- if (XSDDOMHelper.inputEquals((Element)child, XSDConstants.ATTRIBUTE_ELEMENT_TAG, true))
+ if (XSDDOMHelper.inputEquals(child, XSDConstants.ATTRIBUTE_ELEMENT_TAG, true))
{
selectionProvider.setSelection(new StructuredSelection(comp.getContainer()));
}
@@ -255,9 +255,9 @@
{
if (sourceContext instanceof AbstractEditPartViewer)
{
- AbstractEditPartViewer viewer = (AbstractEditPartViewer)sourceContext;
+// AbstractEditPartViewer viewer = (AbstractEditPartViewer)sourceContext;
- Object obj = viewer.getSelectedEditParts().get(0);
+// Object obj = viewer.getSelectedEditParts().get(0);
// if (obj instanceof GraphicalEditPart)
// {
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/actions/MoveAction.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/actions/MoveAction.java
index 61345db..4a7f319 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/actions/MoveAction.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/actions/MoveAction.java
@@ -119,7 +119,7 @@
{
if (particleContent == nextRefComponent)
{
- parentModelGroup.getContents().add(index, (XSDParticle) concreteComponent.getContainer());
+ parentModelGroup.getContents().add(index, concreteComponent.getContainer());
break;
}
}
@@ -127,7 +127,7 @@
{
if (particleContent == previousRefComponent)
{
- parentModelGroup.getContents().add(index + 1, (XSDParticle) concreteComponent.getContainer());
+ parentModelGroup.getContents().add(index + 1, concreteComponent.getContainer());
break;
}
}
@@ -135,7 +135,7 @@
}
if (particles.size() == 0)
{
- parentModelGroup.getContents().add((XSDParticle) concreteComponent.getContainer());
+ parentModelGroup.getContents().add(concreteComponent.getContainer());
}
}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/actions/MoveAttributeAction.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/actions/MoveAttributeAction.java
index b7cab4b..896b84d 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/actions/MoveAttributeAction.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/actions/MoveAttributeAction.java
@@ -142,7 +142,7 @@
{
if (attribute == nextRefComponent)
{
- parentModelGroup.getContents().add(index, (XSDAttributeUse) concreteComponent.getContainer());
+ parentModelGroup.getContents().add(index, concreteComponent.getContainer());
break;
}
}
@@ -150,7 +150,7 @@
{
if (attribute == previousRefComponent)
{
- parentModelGroup.getContents().add(index + 1, (XSDAttributeUse) concreteComponent.getContainer());
+ parentModelGroup.getContents().add(index + 1, concreteComponent.getContainer());
break;
}
}
@@ -159,7 +159,7 @@
}
if (attributeGroupContents.size() == 0)
{
- parentModelGroup.getContents().add((XSDAttributeUse) concreteComponent.getContainer());
+ parentModelGroup.getContents().add(concreteComponent.getContainer());
}
}
@@ -214,7 +214,7 @@
{
if (attribute == nextRefComponent)
{
- complexType.getAttributeContents().add(index, (XSDAttributeUse) concreteComponent.getContainer());
+ complexType.getAttributeContents().add(index, concreteComponent.getContainer());
break;
}
}
@@ -222,7 +222,7 @@
{
if (attribute == previousRefComponent)
{
- complexType.getAttributeContents().add(index + 1, (XSDAttributeUse) concreteComponent.getContainer());
+ complexType.getAttributeContents().add(index + 1, concreteComponent.getContainer());
break;
}
}
@@ -231,7 +231,7 @@
}
if (attributeGroupContents.size() == 0)
{
- complexType.getAttributeContents().add((XSDAttributeUse) concreteComponent.getContainer());
+ complexType.getAttributeContents().add(concreteComponent.getContainer());
}
}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDChildUtility.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDChildUtility.java
index 5eb3aec..191110c 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDChildUtility.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDChildUtility.java
@@ -231,7 +231,7 @@
indent += 2;
for (Iterator i = xsdComplexTypeDefinition.getAttributeUses().iterator(); i.hasNext(); )
{
- visitXSDObject((XSDAttributeUse)i.next());
+ visitXSDObject(i.next());
}
visitXSDObject(xsdComplexTypeDefinition.getContent());
indent -= 2;
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDComplexTypeDefinitionAdapter.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDComplexTypeDefinitionAdapter.java
index 6dd469a..e3dcbdc 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDComplexTypeDefinitionAdapter.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDComplexTypeDefinitionAdapter.java
@@ -323,7 +323,7 @@
XSDParticleContent particleContent = ((XSDParticle) xsdComplexTypeContent).getContent();
if (particleContent instanceof XSDModelGroup)
{
- list.add((XSDModelGroup) particleContent);
+ list.add(particleContent);
}
}
}
@@ -345,7 +345,7 @@
XSDParticleContent particleContent = ((XSDParticle) xsdComplexTypeContent).getContent();
if (particleContent instanceof XSDModelGroup)
{
- list.add((XSDModelGroup) particleContent);
+ list.add(particleContent);
}
}
}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDModelGroupAdapter.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDModelGroupAdapter.java
index a8f5657..6765fd65 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDModelGroupAdapter.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDModelGroupAdapter.java
@@ -156,15 +156,15 @@
XSDParticleContent particle = ((XSDParticle)object).getContent();
if (particle instanceof XSDElementDeclaration)
{
- list.add((XSDElementDeclaration)particle);
+ list.add(particle);
}
else if (particle instanceof XSDWildcard)
{
- list.add((XSDWildcard)particle);
+ list.add(particle);
}
else if (particle instanceof XSDModelGroup)
{
- list.add((XSDModelGroup)particle);
+ list.add(particle);
}
}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDSchemaDirectiveAdapter.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDSchemaDirectiveAdapter.java
index baa664f..7364401 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDSchemaDirectiveAdapter.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDSchemaDirectiveAdapter.java
@@ -70,41 +70,29 @@
for (Iterator i = redefine.getContents().iterator(); i.hasNext();)
{
XSDRedefineContent redefineContent = (XSDRedefineContent) i.next();
- if (redefineContent instanceof XSDAttributeGroupDefinition)
+ if (redefineContent instanceof XSDAttributeGroupDefinition ||
+ redefineContent instanceof XSDModelGroupDefinition)
{
- list.add((XSDAttributeGroupDefinition) redefine);
- }
- else if (redefineContent instanceof XSDModelGroupDefinition)
- {
- list.add((XSDModelGroupDefinition) redefineContent);
+ list.add(redefineContent);
}
else if (redefineContent instanceof XSDRedefinableComponent)
{
XSDRedefinableComponent comp = (XSDRedefinableComponent) redefineContent;
- if (comp instanceof XSDAttributeGroupDefinition)
+ if (comp instanceof XSDAttributeGroupDefinition ||
+ comp instanceof XSDModelGroupDefinition ||
+ comp instanceof XSDComplexTypeDefinition ||
+ comp instanceof XSDSimpleTypeDefinition)
{
- list.add((XSDAttributeGroupDefinition) comp);
- }
- else if (comp instanceof XSDModelGroupDefinition)
- {
- list.add((XSDModelGroupDefinition) comp);
- }
- else if (comp instanceof XSDComplexTypeDefinition)
- {
- list.add((XSDComplexTypeDefinition) comp);
- }
- else if (comp instanceof XSDSimpleTypeDefinition)
- {
- list.add((XSDSimpleTypeDefinition) comp);
+ list.add(comp);
}
}
else if (redefineContent instanceof XSDComplexTypeDefinition)
{
- list.add((XSDComplexTypeDefinition) redefineContent);
+ list.add(redefineContent);
}
else if (redefineContent instanceof XSDSimpleTypeDefinition)
{
- list.add((XSDSimpleTypeDefinition) redefineContent);
+ list.add(redefineContent);
}
}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/commands/DragAndDropCommand.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/commands/DragAndDropCommand.java
index 42d60af..20a0388 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/commands/DragAndDropCommand.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/commands/DragAndDropCommand.java
@@ -94,7 +94,7 @@
for (Iterator i = editPartsList.iterator(); i.hasNext(); )
{
EditPart editPart = (EditPart)i.next();
- concreteComponentList.add((XSDConcreteComponent) ((XSDBaseAdapter)editPart.getModel()).getTarget());
+ concreteComponentList.add(((XSDBaseAdapter)editPart.getModel()).getTarget());
}
Object itemToDrag = list.get(0);
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editparts/AttributeGroupDefinitionEditPart.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editparts/AttributeGroupDefinitionEditPart.java
index 4719f79..c238bce 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editparts/AttributeGroupDefinitionEditPart.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editparts/AttributeGroupDefinitionEditPart.java
@@ -101,7 +101,7 @@
}
else if (child instanceof TargetConnectionSpacingFigureEditPart)
{
- TargetConnectionSpacingFigureEditPart elem = (TargetConnectionSpacingFigureEditPart) child;
+// TargetConnectionSpacingFigureEditPart elem = (TargetConnectionSpacingFigureEditPart) child;
connectionFigure.setTargetAnchor(new CenteredConnectionAnchor(((TargetConnectionSpacingFigureEditPart) child).getFigure(), CenteredConnectionAnchor.LEFT, 0, 0));
}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editparts/ModelGroupEditPart.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editparts/ModelGroupEditPart.java
index 1452c8d..83fe052 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editparts/ModelGroupEditPart.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editparts/ModelGroupEditPart.java
@@ -62,7 +62,6 @@
protected void refreshVisuals()
{
- String iconName = "icons/newSequence.gif"; //$NON-NLS-1$
GenericGroupFigure modelGroupFigure = (GenericGroupFigure)getFigure();
switch (getXSDModelGroup().getCompositor().getValue())
{
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editparts/TopLevelComponentEditPart.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editparts/TopLevelComponentEditPart.java
index 930843b..0c67ee9 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editparts/TopLevelComponentEditPart.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editparts/TopLevelComponentEditPart.java
@@ -124,8 +124,8 @@
{
isReadOnly = adapter.isReadOnly();
label.setForegroundColor(computeLabelColor());
- label.setText((String) adapter.getText());
- Image image = (Image) adapter.getImage();
+ label.setText(adapter.getText());
+ Image image = adapter.getImage();
if (image != null)
label.setIcon(image);
// arrowLabel.setVisible(Boolean.TRUE.equals(adapter.getProperty(getModel(),
@@ -290,7 +290,7 @@
public void doEditName()
{
removeFeedback();
- Object object = getModel();
+ //Object object = getModel();
// if (object instanceof XSDNamedComponent)
// {
// ComponentNameDirectEditManager manager = new
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/dialogs/BuiltInTypesTreeViewerProvider.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/dialogs/BuiltInTypesTreeViewerProvider.java
index 2d8bcbe..f0cecbb 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/dialogs/BuiltInTypesTreeViewerProvider.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/dialogs/BuiltInTypesTreeViewerProvider.java
@@ -34,7 +34,7 @@
ITreeContentProvider contentProvider;
- private static final String CONST_PARENT = "parent";
+// private static final String CONST_PARENT = "parent";
/**
* Currently there are 3 subgroups: Numbers, Data and Time, Other
@@ -163,7 +163,7 @@
else if (element instanceof ComponentSpecification ){
spec = (ComponentSpecification) element;
}
- return (String) spec.getName();
+ return spec.getName();
}
public void addListener(ILabelProviderListener listener) {
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/dialogs/SelectBuiltInTypesForFilteringDialog.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/dialogs/SelectBuiltInTypesForFilteringDialog.java
index cd83b4d..a437d6c 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/dialogs/SelectBuiltInTypesForFilteringDialog.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/dialogs/SelectBuiltInTypesForFilteringDialog.java
@@ -94,7 +94,7 @@
Object o = aContainer.get(i);
if ( o instanceof ComponentSpecification){
ComponentSpecification aType = (ComponentSpecification) o;
- String typeName = (String) aType.getName();
+ String typeName = aType.getName();
// if typeName's name appears in 'listString'
if ( listString.indexOf(typeName + CUSTOM_LIST_SEPARATOR) != -1)
selectedTypes.add(o);
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/BaseHyperlinkDetector.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/BaseHyperlinkDetector.java
index 7430265..c81ef74 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/BaseHyperlinkDetector.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/BaseHyperlinkDetector.java
@@ -248,7 +248,6 @@
// Do not include quotes in attribute value region.
if (StringUtils.isQuoted(attValue))
{
- regOffset = ++regOffset;
regLength = regLength - 2;
}
hyperRegion = new Region(regOffset, regLength);
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/XSDElementReferenceEditManager.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/XSDElementReferenceEditManager.java
index 1ef88df..8ebc015 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/XSDElementReferenceEditManager.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/XSDElementReferenceEditManager.java
@@ -100,7 +100,7 @@
command.execute();
elementDec = (XSDElementDeclaration) command.getAddedComponent();
}
- if (elementDec != null && elementDec instanceof XSDElementDeclaration)
+ if (elementDec != null)
{
Command command = new UpdateElementReferenceCommand(Messages._UI_ACTION_UPDATE_ELEMENT_REFERENCE,
concreteComponent, elementDec);
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/XSDHyperlinkDetector.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/XSDHyperlinkDetector.java
index 501fbbe..7aa5cf3 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/XSDHyperlinkDetector.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/XSDHyperlinkDetector.java
@@ -36,7 +36,6 @@
import org.eclipse.xsd.XSDVariety;
import org.eclipse.xsd.util.XSDConstants;
import org.w3c.dom.Attr;
-import org.w3c.dom.Node;
/**
* Detects hyperlinks for XSD files. Used by the XSD text editor to provide a
@@ -109,7 +108,7 @@
{
XSDConcreteComponent component = null;
- XSDConcreteComponent xsdComp = xsdSchema.getCorrespondingComponent((Node) node);
+ XSDConcreteComponent xsdComp = xsdSchema.getCorrespondingComponent(node);
if (xsdComp instanceof XSDElementDeclaration)
{
XSDElementDeclaration elementDecl = (XSDElementDeclaration) xsdComp;
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/XSDMultiPageEditorContributor.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/XSDMultiPageEditorContributor.java
index 001d4e3..1f896bc 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/XSDMultiPageEditorContributor.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/XSDMultiPageEditorContributor.java
@@ -112,7 +112,7 @@
IEditorPart activeNestedEditor = null;
if (part instanceof MultiPageEditorPart)
{
- activeNestedEditor = ((MultiPageEditorPart) part);
+ activeNestedEditor = part;
}
setActivePage(activeNestedEditor);
List list = XSDEditorPlugin.getPlugin().getXSDEditorConfiguration().getToolbarActions();
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/XSDTabbedPropertySheetPage.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/XSDTabbedPropertySheetPage.java
index 2f1f607..688615a 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/XSDTabbedPropertySheetPage.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/XSDTabbedPropertySheetPage.java
@@ -75,7 +75,7 @@
Object model = adapter.getTarget();
if (model instanceof XSDConcreteComponent)
{
- selection = new StructuredSelection((XSDConcreteComponent)model);
+ selection = new StructuredSelection(model);
}
super.selectionChanged(part, selection);
return;
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/search/XSDSearchListDialogDelegate.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/search/XSDSearchListDialogDelegate.java
index e201869..5001716 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/search/XSDSearchListDialogDelegate.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/search/XSDSearchListDialogDelegate.java
@@ -13,10 +13,6 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.jface.window.Window;
import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
import org.eclipse.wst.common.core.search.pattern.QualifiedName;
import org.eclipse.wst.common.ui.internal.search.dialogs.ComponentSearchListDialog;
import org.eclipse.wst.common.ui.internal.search.dialogs.ComponentSearchListDialogConfiguration;
@@ -104,11 +100,11 @@
return returnValue;
}
- private IEditorPart getActiveEditor()
- {
- IWorkbench workbench = PlatformUI.getWorkbench();
- IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
- IEditorPart editorPart = workbenchWindow.getActivePage().getActiveEditor();
- return editorPart;
- }
+// private IEditorPart getActiveEditor()
+// {
+// IWorkbench workbench = PlatformUI.getWorkbench();
+// IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
+// IEditorPart editorPart = workbenchWindow.getActivePage().getActiveEditor();
+// return editorPart;
+// }
}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/nsedit/XSDVisitor.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/nsedit/XSDVisitor.java
index c9bfbaf..a0e2f8b 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/nsedit/XSDVisitor.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/nsedit/XSDVisitor.java
@@ -144,7 +144,7 @@
{
if (type.getContentType() != null)
{
- XSDComplexTypeContent complexContent = (XSDComplexTypeContent) type.getContentType();
+ XSDComplexTypeContent complexContent = type.getContentType();
if (complexContent instanceof XSDSimpleTypeDefinition)
{
visitSimpleTypeDefinition((XSDSimpleTypeDefinition)complexContent);
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/utils/OpenOnSelectionHelper.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/utils/OpenOnSelectionHelper.java
index 165234e..637b66f 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/utils/OpenOnSelectionHelper.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/utils/OpenOnSelectionHelper.java
@@ -129,7 +129,7 @@
{
try
{
- IEditorPart editorPart = workbenchWindow.getActivePage().openEditor(new FileEditorInput(schemaFile), XSDEditorPlugin.getPlugin().PLUGIN_ID);
+ IEditorPart editorPart = workbenchWindow.getActivePage().openEditor(new FileEditorInput(schemaFile), XSDEditorPlugin.PLUGIN_ID);
if (editorPart instanceof InternalXSDMultiPageEditor)
{
((InternalXSDMultiPageEditor)editorPart).openOnGlobalReference(component);
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/widgets/EnumerationsDialog.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/widgets/EnumerationsDialog.java
index a8c4c19..a515b3a 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/widgets/EnumerationsDialog.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/widgets/EnumerationsDialog.java
@@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.wst.xsd.ui.internal.widgets;
-import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.window.Window;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Button;
@@ -44,7 +44,7 @@
protected void buttonPressed(int buttonId)
{
- if (buttonId == Dialog.OK)
+ if (buttonId == Window.OK)
{
text = textField.getText();
delimiter = delimiterField.getText();
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/wizards/RegexTestingPage.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/wizards/RegexTestingPage.java
index e6c254b..6a7ab8b 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/wizards/RegexTestingPage.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/wizards/RegexTestingPage.java
@@ -92,7 +92,7 @@
GC gc = new GC(separator);
Point pointSize = gc.stringExtent(XSDEditorPlugin.getXSDString("_UI_REGEX_WIZARD_TESTING_PAGE_DESCRIPTION"));
GridData gd = new GridData();
- gd.widthHint = (int)(pointSize.x / 2 + gc.getAdvanceWidth('M')*11);
+ gd.widthHint = pointSize.x / 2 + gc.getAdvanceWidth('M')*11;
gd.horizontalAlignment= GridData.FILL;
separator.setLayoutData(gd);
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/actions/AddFieldAction.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/actions/AddFieldAction.java
index 289c53f..1f2c657 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/actions/AddFieldAction.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/actions/AddFieldAction.java
@@ -50,7 +50,7 @@
}
if (type != null)
{
- Command command = ((IComplexType)type).getAddNewFieldCommand(""); //$NON-NLS-1$
+ Command command = type.getAddNewFieldCommand(""); //$NON-NLS-1$
if (command != null)
{
getCommandStack().execute(command);
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/directedit/ADTComboBoxCellEditor.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/directedit/ADTComboBoxCellEditor.java
index 993c588..340a2ed 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/directedit/ADTComboBoxCellEditor.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/directedit/ADTComboBoxCellEditor.java
@@ -27,13 +27,9 @@
import org.eclipse.swt.graphics.GC;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.wst.xsd.ui.internal.adt.edit.ComponentReferenceEditManager;
import org.eclipse.wst.xsd.ui.internal.adt.edit.IComponentDialog;
import org.eclipse.wst.xsd.ui.internal.adt.editor.Messages;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
/*
* This is a copy of ComboBoxCellEditor.
@@ -357,12 +353,12 @@
/*
* TODO: rmah: This should be moved to WSDLEditorPlugin.java
*/
- private IEditorPart getActiveEditor()
- {
- IWorkbench workbench = XSDEditorPlugin.getDefault().getWorkbench();
- IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
- IEditorPart editorPart = workbenchWindow.getActivePage().getActiveEditor();
-
- return editorPart;
- }
+// private IEditorPart getActiveEditor()
+// {
+// IWorkbench workbench = XSDEditorPlugin.getDefault().getWorkbench();
+// IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
+// IEditorPart editorPart = workbenchWindow.getActivePage().getActiveEditor();
+//
+// return editorPart;
+// }
}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/BaseFieldEditPart.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/BaseFieldEditPart.java
index 13b8654..4cfe06f 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/BaseFieldEditPart.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/BaseFieldEditPart.java
@@ -152,7 +152,7 @@
public DragTracker getDragTracker(Request request)
{
- return new GraphNodeDragTracker((EditPart)this);
+ return new GraphNodeDragTracker(this);
}
/*
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/editor/ADTMultiPageEditor.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/editor/ADTMultiPageEditor.java
index 0f1bd97..759446a 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/editor/ADTMultiPageEditor.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/editor/ADTMultiPageEditor.java
@@ -18,7 +18,6 @@
import org.eclipse.gef.editparts.ZoomManager;
import org.eclipse.gef.ui.actions.ActionRegistry;
import org.eclipse.gef.ui.parts.ScrollingGraphicalViewer;
-import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
import org.eclipse.wst.xsd.ui.internal.adt.actions.BaseSelectionAction;
import org.eclipse.wst.xsd.ui.internal.adt.actions.SetInputToGraphView;
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/outline/ADTContentOutlinePage.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/outline/ADTContentOutlinePage.java
index 2ddf00e..950bb64 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/outline/ADTContentOutlinePage.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/outline/ADTContentOutlinePage.java
@@ -14,7 +14,6 @@
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.jface.viewers.StructuredSelection;
@@ -86,7 +85,7 @@
setSelectionManager(editor.getSelectionManager());
// Create menu...for now reuse graph's. Note edit part viewer = null
- DesignViewContextMenuProvider menuProvider = new DesignViewContextMenuProvider(editor, null, (ISelectionProvider)editor.getSelectionManager());
+ DesignViewContextMenuProvider menuProvider = new DesignViewContextMenuProvider(editor, null, editor.getSelectionManager());
menuManager.addMenuListener(menuProvider);
getSite().registerContextMenu("org.eclipse.wst.xsd.ui.popup.outline", menuManager, editor.getSelectionManager()); //$NON-NLS-1$
@@ -151,7 +150,7 @@
// }
public void setSelectionManager(MultiPageSelectionProvider newSelectionManager)
{
- TreeViewer treeViewer = getTreeViewer();
+// TreeViewer treeViewer = getTreeViewer();
// disconnect from old one
if (selectionManager != null)
{
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/properties/ADTTabbedPropertySheetPage.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/properties/ADTTabbedPropertySheetPage.java
index 23ed0d3..9b5ec3f 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/properties/ADTTabbedPropertySheetPage.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/properties/ADTTabbedPropertySheetPage.java
@@ -11,7 +11,6 @@
package org.eclipse.wst.xsd.ui.internal.adt.properties;
import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.views.properties.tabbed.ITabbedPropertySheetPageContributor;
import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
@@ -29,7 +28,7 @@
*/
public void selectionChanged(IWorkbenchPart part, ISelection selection) {
- Object selected = ((StructuredSelection)selection).getFirstElement();
+// Object selected = ((StructuredSelection)selection).getFirstElement();
// if (selected instanceof EditPart)
// {
// Object model = ((EditPart)selected).getModel();
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/AddDocumentationCommand.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/AddDocumentationCommand.java
index 7de9161..ef01cb7 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/AddDocumentationCommand.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/AddDocumentationCommand.java
@@ -12,9 +12,7 @@
import java.util.List;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
import org.eclipse.wst.xsd.ui.internal.common.util.XSDCommonUIUtils;
import org.eclipse.xsd.XSDAnnotation;
@@ -41,7 +39,7 @@
public void execute()
{
- xsdAnnotation = XSDCommonUIUtils.getInputXSDAnnotation((XSDConcreteComponent) input, true);
+ xsdAnnotation = XSDCommonUIUtils.getInputXSDAnnotation(input, true);
Element element = xsdAnnotation.getElement();
List documentationList = xsdAnnotation.getUserInformation();
@@ -77,8 +75,8 @@
int start = 0;
int end = 0;
- IDOMModel model = domElement.getModel();
- IDOMDocument doc = model.getDocument();
+// IDOMModel model = domElement.getModel();
+// IDOMDocument doc = model.getDocument();
IDOMNode first = null;
if (firstChild instanceof IDOMNode)
{
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/AddExtensionAttributeCommand.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/AddExtensionAttributeCommand.java
index dfd26dc..498958e 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/AddExtensionAttributeCommand.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/AddExtensionAttributeCommand.java
@@ -25,7 +25,6 @@
private static DOMNamespaceInfoManager manager = new DOMNamespaceInfoManager();
private XSDAttributeDeclaration attribute;
private boolean appInfoAttributeAdded = false;
- private boolean prefixAdded = false;
private String attributeQName;
private String namespacePrefix;
@@ -80,7 +79,6 @@
// Create unquie namespace prefix
if ( prefix == null){
- prefixAdded = true;
prefix = createUniquePrefix(component);
}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/AddXSDComplexTypeDefinitionCommand.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/AddXSDComplexTypeDefinitionCommand.java
index 3b800b1..7db7e48 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/AddXSDComplexTypeDefinitionCommand.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/AddXSDComplexTypeDefinitionCommand.java
@@ -68,7 +68,7 @@
}
else if (parent instanceof XSDElementDeclaration)
{
- ((XSDElementDeclaration) parent).setAnonymousTypeDefinition((XSDComplexTypeDefinition) complexType);
+ ((XSDElementDeclaration) parent).setAnonymousTypeDefinition(complexType);
formatChild(parent.getElement());
}
createdComplexType = complexType;
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/DeleteCommand.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/DeleteCommand.java
index 28aa945..8a53081 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/DeleteCommand.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/DeleteCommand.java
@@ -87,7 +87,7 @@
}
if (complexType != null)
{
- complexType.getAttributeContents().remove((XSDAttributeUse) parent);
+ complexType.getAttributeContents().remove(parent);
}
if (parent.getContainer() instanceof XSDAttributeGroupDefinition)
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/UpdateNameCommand.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/UpdateNameCommand.java
index fea5696..520eec3 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/UpdateNameCommand.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/UpdateNameCommand.java
@@ -16,7 +16,7 @@
public class UpdateNameCommand extends Command
{
- private String oldName;
+// private String oldName;
private String newName;
private XSDNamedComponent component;
@@ -31,7 +31,7 @@
this.component = component;
this.newName = newName;
- this.oldName = component.getName();
+// this.oldName = component.getName();
}
/*
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/providers/XSDSectionLabelProvider.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/providers/XSDSectionLabelProvider.java
index 70497ef..d464f81 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/providers/XSDSectionLabelProvider.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/providers/XSDSectionLabelProvider.java
@@ -10,7 +10,6 @@
*******************************************************************************/
package org.eclipse.wst.xsd.ui.internal.common.properties.providers;
-import org.eclipse.jface.util.Assert;
import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.swt.graphics.Image;
@@ -56,11 +55,7 @@
if (selected instanceof XSDConcreteComponent)
{
XSDBaseAdapter adapter = (XSDBaseAdapter)XSDAdapterFactory.getInstance().adapt((XSDConcreteComponent)selected);
- if (adapter instanceof ITreeElement)
- {
- return ((ITreeElement)adapter).getImage();
- }
-
+ return ((ITreeElement)adapter).getImage();
}
}
return result;
@@ -142,12 +137,4 @@
return result;
}
-
- private Object getObject(Object objects, boolean multiple[])
- {
- Assert.isNotNull(objects);
- Object object = null;
- return object;
- }
-
}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/AbstractExtensionsSection.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/AbstractExtensionsSection.java
index ed45e2f..f2e36a9 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/AbstractExtensionsSection.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/AbstractExtensionsSection.java
@@ -36,6 +36,7 @@
import org.eclipse.swt.widgets.TreeItem;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.forms.widgets.ExpandableComposite;
import org.eclipse.ui.forms.widgets.Section;
import org.eclipse.ui.part.PageBook;
import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
@@ -169,7 +170,7 @@
gridLayout.numColumns = 1;
leftContent.setLayout(gridLayout);
- Section section = getWidgetFactory().createSection(leftContent, SWT.FLAT | Section.TITLE_BAR);
+ Section section = getWidgetFactory().createSection(leftContent, SWT.FLAT | ExpandableComposite.TITLE_BAR);
section.setText(Messages._UI_LABEL_EXTENSIONS);
section.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
@@ -266,7 +267,7 @@
down.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
Composite rightContent = getWidgetFactory().createComposite(sashForm, SWT.FLAT);
- Section section2 = getWidgetFactory().createSection(rightContent, SWT.FLAT | Section.TITLE_BAR);
+ Section section2 = getWidgetFactory().createSection(rightContent, SWT.FLAT | ExpandableComposite.TITLE_BAR);
section2.setText(Messages._UI_LABEL_EXTENSION_DETAILS);
section2.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
//contentLabel = getWidgetFactory().createLabel(rightContent, "Content");
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/AbstractSection.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/AbstractSection.java
index 6480f5e..c90c0a9 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/AbstractSection.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/AbstractSection.java
@@ -24,7 +24,6 @@
import org.eclipse.swt.events.SelectionListener;
import org.eclipse.swt.graphics.GC;
import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Rectangle;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Event;
@@ -78,7 +77,7 @@
return new PaintListener() {
public void paintControl(PaintEvent e) {
- Rectangle bounds = composite.getClientArea();
+// Rectangle bounds = composite.getClientArea();
GC gc = e.gc;
gc.setForeground(gc.getBackground());
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/SimpleContentUnionMemberTypesDialog.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/SimpleContentUnionMemberTypesDialog.java
index 3d6ec24..a090be1 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/SimpleContentUnionMemberTypesDialog.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/SimpleContentUnionMemberTypesDialog.java
@@ -14,6 +14,7 @@
import java.util.List;
import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.window.Window;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
@@ -62,7 +63,7 @@
protected void buttonPressed(int buttonId)
{
- if (buttonId == Dialog.OK)
+ if (buttonId == Window.OK)
{
StringBuffer sb = new StringBuffer();
int length = memberTypesList.getItemCount();
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/SpecificConstraintsWidget.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/SpecificConstraintsWidget.java
index ac19f97..ff909a0 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/SpecificConstraintsWidget.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/SpecificConstraintsWidget.java
@@ -224,7 +224,7 @@
public void widgetSelected(SelectionEvent e)
{
- XSDSimpleTypeDefinition st = (XSDSimpleTypeDefinition) input;
+ XSDSimpleTypeDefinition st = input;
Element element = st.getElement();
if (e.widget == addButton)
@@ -258,7 +258,7 @@
anonymousSimpleType = XSDFactory.eINSTANCE.createXSDSimpleTypeDefinition();
anonymousSimpleType.setBaseTypeDefinition(input);
- ChangeToLocalSimpleTypeCommand changeToAnonymousCommand = new ChangeToLocalSimpleTypeCommand(Messages._UI_ACTION_CHANGE_PATTERN, (XSDFeature) feature);
+ ChangeToLocalSimpleTypeCommand changeToAnonymousCommand = new ChangeToLocalSimpleTypeCommand(Messages._UI_ACTION_CHANGE_PATTERN, feature);
changeToAnonymousCommand.setAnonymousSimpleType(anonymousSimpleType);
compoundCommand.add(changeToAnonymousCommand);
input = anonymousSimpleType;
@@ -311,7 +311,7 @@
anonymousSimpleType = XSDFactory.eINSTANCE.createXSDSimpleTypeDefinition();
anonymousSimpleType.setBaseTypeDefinition(input);
- ChangeToLocalSimpleTypeCommand changeToAnonymousCommand = new ChangeToLocalSimpleTypeCommand(Messages._UI_ACTION_CHANGE_PATTERN, (XSDFeature) feature);
+ ChangeToLocalSimpleTypeCommand changeToAnonymousCommand = new ChangeToLocalSimpleTypeCommand(Messages._UI_ACTION_CHANGE_PATTERN, feature);
changeToAnonymousCommand.setAnonymousSimpleType(anonymousSimpleType);
compoundCommand.add(changeToAnonymousCommand);
input = anonymousSimpleType;
@@ -354,7 +354,7 @@
anonymousSimpleType = XSDFactory.eINSTANCE.createXSDSimpleTypeDefinition();
anonymousSimpleType.setBaseTypeDefinition(input);
- ChangeToLocalSimpleTypeCommand changeToAnonymousCommand = new ChangeToLocalSimpleTypeCommand("", (XSDFeature) feature); //$NON-NLS-1$
+ ChangeToLocalSimpleTypeCommand changeToAnonymousCommand = new ChangeToLocalSimpleTypeCommand("", feature); //$NON-NLS-1$
changeToAnonymousCommand.setAnonymousSimpleType(anonymousSimpleType);
compoundCommand.add(changeToAnonymousCommand);
input = anonymousSimpleType;
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/XSDSimpleTypeSection.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/XSDSimpleTypeSection.java
index f90d7a9..a44d161 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/XSDSimpleTypeSection.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/XSDSimpleTypeSection.java
@@ -517,7 +517,7 @@
Node child = children.item(i);
if (child != null && child instanceof Element)
{
- if (XSDDOMHelper.inputEquals((Element) child, elementTag, isRef))
+ if (XSDDOMHelper.inputEquals(child, elementTag, isRef))
{
targetNode = (Element) child;
break;
@@ -546,56 +546,57 @@
return stringName;
}
- private void updateSimpleTypeFacets()
- {
- XSDSimpleTypeDefinition st = (XSDSimpleTypeDefinition) input;
- Element simpleTypeElement = st.getElement();
- Element derivedByElement = baseTypeDefinition.getElement();
- if (derivedByElement != null)
- {
- List nodesToRemove = new ArrayList();
- NodeList childList = derivedByElement.getChildNodes();
- int length = childList.getLength();
- for (int i = 0; i < length; i++)
- {
- Node child = childList.item(i);
- if (child instanceof Element)
- {
- Element elementChild = (Element) child;
- if (!(elementChild.getLocalName().equals("pattern") || elementChild.getLocalName().equals("enumeration") || //$NON-NLS-1$ //$NON-NLS-2$
- XSDDOMHelper.inputEquals(elementChild, XSDConstants.SIMPLETYPE_ELEMENT_TAG, false) || XSDDOMHelper.inputEquals(elementChild, XSDConstants.ANNOTATION_ELEMENT_TAG, false)
- || XSDDOMHelper.inputEquals(elementChild, XSDConstants.ATTRIBUTE_ELEMENT_TAG, false) || XSDDOMHelper.inputEquals(elementChild, XSDConstants.ATTRIBUTE_ELEMENT_TAG, true)
- || XSDDOMHelper.inputEquals(elementChild, XSDConstants.ATTRIBUTEGROUP_ELEMENT_TAG, false) || XSDDOMHelper.inputEquals(elementChild, XSDConstants.ATTRIBUTEGROUP_ELEMENT_TAG, true) || XSDDOMHelper.inputEquals(elementChild,
- XSDConstants.ANYATTRIBUTE_ELEMENT_TAG, false)))
- {
- nodesToRemove.add(child);
- }
- }
- }
- Iterator iter = nodesToRemove.iterator();
- while (iter.hasNext())
- {
- Element facetToRemove = (Element) iter.next();
- String facetName = facetToRemove.getLocalName();
- Iterator it = st.getValidFacets().iterator();
- boolean doRemove = true;
- while (it.hasNext())
- {
- String aValidFacet = (String) it.next();
- if (aValidFacet.equals(facetName))
- {
- doRemove = false;
- break;
- }
- }
- if (doRemove)
- {
- XSDDOMHelper.removeNodeAndWhitespace(facetToRemove);
- }
- }
- }
- }
- // TODO: Common this up with element declaration
+// private void updateSimpleTypeFacets()
+// {
+// XSDSimpleTypeDefinition st = (XSDSimpleTypeDefinition) input;
+// Element simpleTypeElement = st.getElement();
+// Element derivedByElement = baseTypeDefinition.getElement();
+// if (derivedByElement != null)
+// {
+// List nodesToRemove = new ArrayList();
+// NodeList childList = derivedByElement.getChildNodes();
+// int length = childList.getLength();
+// for (int i = 0; i < length; i++)
+// {
+// Node child = childList.item(i);
+// if (child instanceof Element)
+// {
+// Element elementChild = (Element) child;
+// if (!(elementChild.getLocalName().equals("pattern") || elementChild.getLocalName().equals("enumeration") || //$NON-NLS-1$ //$NON-NLS-2$
+// XSDDOMHelper.inputEquals(elementChild, XSDConstants.SIMPLETYPE_ELEMENT_TAG, false) || XSDDOMHelper.inputEquals(elementChild, XSDConstants.ANNOTATION_ELEMENT_TAG, false)
+// || XSDDOMHelper.inputEquals(elementChild, XSDConstants.ATTRIBUTE_ELEMENT_TAG, false) || XSDDOMHelper.inputEquals(elementChild, XSDConstants.ATTRIBUTE_ELEMENT_TAG, true)
+// || XSDDOMHelper.inputEquals(elementChild, XSDConstants.ATTRIBUTEGROUP_ELEMENT_TAG, false) || XSDDOMHelper.inputEquals(elementChild, XSDConstants.ATTRIBUTEGROUP_ELEMENT_TAG, true) || XSDDOMHelper.inputEquals(elementChild,
+// XSDConstants.ANYATTRIBUTE_ELEMENT_TAG, false)))
+// {
+// nodesToRemove.add(child);
+// }
+// }
+// }
+// Iterator iter = nodesToRemove.iterator();
+// while (iter.hasNext())
+// {
+// Element facetToRemove = (Element) iter.next();
+// String facetName = facetToRemove.getLocalName();
+// Iterator it = st.getValidFacets().iterator();
+// boolean doRemove = true;
+// while (it.hasNext())
+// {
+// String aValidFacet = (String) it.next();
+// if (aValidFacet.equals(facetName))
+// {
+// doRemove = false;
+// break;
+// }
+// }
+// if (doRemove)
+// {
+// XSDDOMHelper.removeNodeAndWhitespace(facetToRemove);
+// }
+// }
+// }
+// }
+
+ // TODO: Common this up with element declaration
public void doHandleEvent(Event event)
{
if (event.widget == nameText)
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/AddExtensionsComponentDialog.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/AddExtensionsComponentDialog.java
index 9943fdd..44bd308 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/AddExtensionsComponentDialog.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/AddExtensionsComponentDialog.java
@@ -70,13 +70,13 @@
Button addButton, removeButton, editButton;
- public AddExtensionsComponentDialog(Shell parent, ExtensionsSchemasRegistry registry)
+ public AddExtensionsComponentDialog(Shell parent, ExtensionsSchemasRegistry schemaRegistry)
{
super(parent);
setTitle(Messages._UI_ACTION_ADD_EXTENSION_COMPONENTS);
setShellStyle(SWT.APPLICATION_MODAL | SWT.RESIZE | SWT.CLOSE);
- this.registry = registry;
+ registry = schemaRegistry;
}
private List fInput;
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/util/XSDCommonUIUtils.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/util/XSDCommonUIUtils.java
index c89080b..c2a6b3d 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/util/XSDCommonUIUtils.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/util/XSDCommonUIUtils.java
@@ -46,7 +46,6 @@
import org.eclipse.xsd.XSDWildcard;
import org.eclipse.xsd.XSDXPathDefinition;
import org.eclipse.xsd.util.XSDConstants;
-import org.eclipse.xsd.util.XSDUtil;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -349,7 +348,7 @@
XSDTypeDefinition origType = baseType; // KC: although invalid, we need to
// prevent cycles and to avoid an
// infinite loop
- while (baseType != null && !XSDUtil.isAnySimpleType(baseType) && !XSDUtil.isAnyType(baseType) && origType != baseType)
+ while (baseType != null && !XSDConstants.isAnySimpleType(baseType) && !XSDConstants.isAnyType(baseType) && origType != baseType)
{
type = baseType;
baseType = type.getBaseType();
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/rename/RenameComponentProcessor.java b/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/rename/RenameComponentProcessor.java
index 35dfa98..df43cac 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/rename/RenameComponentProcessor.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/rename/RenameComponentProcessor.java
@@ -10,10 +10,10 @@
*******************************************************************************/
package org.eclipse.wst.xsd.ui.internal.refactor.rename;
-import com.ibm.icu.text.Collator;
+//import com.ibm.icu.text.Collator;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Comparator;
+//import java.util.Comparator;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
@@ -33,7 +33,7 @@
import org.eclipse.ltk.core.refactoring.CompositeChange;
import org.eclipse.ltk.core.refactoring.RefactoringStatus;
import org.eclipse.ltk.core.refactoring.TextChange;
-import org.eclipse.ltk.core.refactoring.TextFileChange;
+//import org.eclipse.ltk.core.refactoring.TextFileChange;
import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext;
import org.eclipse.ltk.core.refactoring.participants.ParticipantManager;
import org.eclipse.ltk.core.refactoring.participants.RefactoringParticipant;
@@ -450,13 +450,13 @@
try {
String changeName = RefactoringMessages.getString("RenameComponentProcessor.Component_Refactoring_updates");
TextChange[] changes = changeManager.getAllChanges();
- Comparator c = new Comparator() {
- public int compare(Object o1, Object o2) {
- TextFileChange c1 = (TextFileChange) o1;
- TextFileChange c2 = (TextFileChange) o2;
- return Collator.getInstance().compare(c1.getFile().getFullPath(), c2.getFile().getFullPath());
- }
- };
+// Comparator c = new Comparator() {
+// public int compare(Object o1, Object o2) {
+// TextFileChange c1 = (TextFileChange) o1;
+// TextFileChange c2 = (TextFileChange) o2;
+// return Collator.getInstance().compare(c1.getFile().getFullPath(), c2.getFile().getFullPath());
+// }
+// };
if (changes.length > 0) {
// Arrays.sort(changes, c);
CompositeChange compositeChange = new CompositeChange("!" + changeName, changes);
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/rename/ResourceRenameParticipant.java b/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/rename/ResourceRenameParticipant.java
index ecb772f..14466ea 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/rename/ResourceRenameParticipant.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/rename/ResourceRenameParticipant.java
@@ -12,9 +12,9 @@
import java.util.ArrayList;
import java.util.List;
+
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.OperationCanceledException;
import org.eclipse.core.runtime.SubProgressMonitor;
@@ -36,7 +36,7 @@
*/
public class ResourceRenameParticipant extends RenameParticipant {
- private IFile file = null;
+// private IFile file = null;
private TextChangeManager changeManager;
@@ -59,7 +59,7 @@
if(contentType != null){
if(XSD_CONTENT_TYPE_ID.equals(contentType.getId()) ||
WSDL_CONTENT_TYPE_ID.equals(contentType.getId())){
- file = aFile;
+// file = aFile;
return true;
}
}
@@ -77,12 +77,12 @@
return RefactoringMessages.getString("ResourceRenameParticipant.compositeChangeName");
}
- private IPath getNewFilePath() {
-
- IPath oldPath = file.getRawLocation();
- IPath newPath = oldPath.removeLastSegments(1).append(getArguments().getNewName());
- return newPath;
- }
+// private IPath getNewFilePath() {
+//
+// IPath oldPath = file.getRawLocation();
+// IPath newPath = oldPath.removeLastSegments(1).append(getArguments().getNewName());
+// return newPath;
+// }
public RefactoringStatus checkConditions(IProgressMonitor pm,
CheckConditionsContext context) throws OperationCanceledException
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/rename/XMLComponentRenameParticipant.java b/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/rename/XMLComponentRenameParticipant.java
index db4a618..4aba320 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/rename/XMLComponentRenameParticipant.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/rename/XMLComponentRenameParticipant.java
@@ -14,11 +14,11 @@
import java.util.Iterator;
import java.util.List;
-import org.eclipse.core.runtime.Assert;
+//import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.SubProgressMonitor;
+//import org.eclipse.core.runtime.SubProgressMonitor;
import org.eclipse.ltk.core.refactoring.Change;
import org.eclipse.ltk.core.refactoring.RefactoringStatus;
import org.eclipse.ltk.core.refactoring.TextChange;
@@ -71,18 +71,18 @@
}
- private RefactoringStatus createRenameChanges(final IProgressMonitor monitor) throws CoreException {
- Assert.isNotNull(monitor);
- final RefactoringStatus status= new RefactoringStatus();
- try {
- monitor.beginTask("RefactoringMessages.RenameComponentRefactoring_searching", 1);
- createRenameChanges(new SubProgressMonitor(monitor, 1));
- //updateChangeManager(new SubProgressMonitor(monitor, 1), status);
- } finally {
- monitor.done();
- }
- return status;
- }
+// private RefactoringStatus createRenameChanges(final IProgressMonitor monitor) throws CoreException {
+// Assert.isNotNull(monitor);
+// final RefactoringStatus status= new RefactoringStatus();
+// try {
+// monitor.beginTask("RefactoringMessages.RenameComponentRefactoring_searching", 1);
+// createRenameChanges(new SubProgressMonitor(monitor, 1));
+// //updateChangeManager(new SubProgressMonitor(monitor, 1), status);
+// } finally {
+// monitor.done();
+// }
+// return status;
+// }
public Change createChange(IProgressMonitor pm) throws CoreException,
OperationCanceledException {
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/structure/MakeTypeGlobalChange.java b/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/structure/MakeTypeGlobalChange.java
index b737c45..0b1402a 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/structure/MakeTypeGlobalChange.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/structure/MakeTypeGlobalChange.java
@@ -69,8 +69,8 @@
}
public void performModify(final String value) {
- DelayedRenameRunnable runnable = new DelayedRenameRunnable(
- fTypeComponent, value);
+// DelayedRenameRunnable runnable = new DelayedRenameRunnable(
+// fTypeComponent, value);
// TODO: remove Display
//Display.getCurrent().asyncExec(runnable);
}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/FindReferencesInProjectAction.java b/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/FindReferencesInProjectAction.java
index cab3b94..74bc648 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/FindReferencesInProjectAction.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/FindReferencesInProjectAction.java
@@ -34,7 +34,7 @@
{
QualifiedName metaName = determineMetaName(component);
QualifiedName elementQName = new QualifiedName(component.getTargetNamespace(), component.getName());
- IPath fullPath = (IPath) file.getFullPath();
+ IPath fullPath = file.getFullPath();
ProjectSearchScope scope = new ProjectSearchScope(fullPath);
String scopeDescription = "Workspace";
XSDSearchQuery searchQuery = new XSDSearchQuery(pattern, file, elementQName, metaName, XSDSearchQuery.LIMIT_TO_REFERENCES, scope, scopeDescription);