Attachment 27095 Details for Bug 109468 – org.eclipse.wst.xsd.ui.patch

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] org.eclipse.wst.xsd.ui.patch

org.eclipse.wst.xsd.ui.patch (text/plain), 9.46 KB, created by Amy Wu

on 2005-09-14 02:20:43 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Amy Wu

Created: 2005-09-14 02:20:43 EDT

Size: 9.46 KB

patch

obsolete

>Index: src/org/eclipse/wst/xsd/ui/internal/XSDActionBarContributor.java
>===================================================================
>RCS file: /home/webtools/wst/components/xsd/plugins/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/XSDActionBarContributor.java,v
>retrieving revision 1.6
>diff -u -r1.6 XSDActionBarContributor.java
>--- src/org/eclipse/wst/xsd/ui/internal/XSDActionBarContributor.java	12 Jul 2005 19:38:31 -0000	1.6
>+++ src/org/eclipse/wst/xsd/ui/internal/XSDActionBarContributor.java	14 Sep 2005 06:18:47 -0000
>@@ -44,7 +44,7 @@
> public class XSDActionBarContributor extends MultiPageEditorActionBarContributor
> {
>   protected XSDEditor xsdEditor;
>-  protected XSDTextEditor textEditor;
>+  protected ITextEditor textEditor;
>   protected IEditorActionBarContributor sourceViewerActionContributor = null;
>   
>   protected ReloadDependenciesAction reloadDependenciesAction;
>Index: src/org/eclipse/wst/xsd/ui/internal/XSDMultiPageEditorPart.java
>===================================================================
>RCS file: /home/webtools/wst/components/xsd/plugins/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/XSDMultiPageEditorPart.java,v
>retrieving revision 1.13
>diff -u -r1.13 XSDMultiPageEditorPart.java
>--- src/org/eclipse/wst/xsd/ui/internal/XSDMultiPageEditorPart.java	13 Sep 2005 18:17:36 -0000	1.13
>+++ src/org/eclipse/wst/xsd/ui/internal/XSDMultiPageEditorPart.java	14 Sep 2005 06:18:48 -0000
>@@ -50,9 +50,9 @@
> import org.eclipse.wst.sse.ui.internal.StructuredTextEditor;
> import org.eclipse.wst.sse.ui.internal.provisional.extensions.ISourceEditingTextTools;
> import org.eclipse.wst.xml.core.internal.provisional.IXMLPreferenceNames;
>+import org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML;
> import org.eclipse.wst.xml.ui.internal.Logger;
> import org.eclipse.wst.xml.ui.internal.provisional.IDOMSourceEditingTextTools;
>-import org.eclipse.wst.xml.ui.internal.provisional.StructuredTextEditorXML;
> import org.eclipse.wst.xml.ui.internal.tabletree.XMLEditorMessages;
> import org.w3c.dom.Document;
> 
>@@ -213,6 +213,12 @@
> 					IEditorActionBarContributor multiContributor = XSDMultiPageEditorPart.this.getEditorSite().getActionBarContributor();
> 					return contributor;
> 				}
>+				
>+				public String getId() {
>+					// sets this id so nested editor is considered xml source
>+					// page
>+					return ContentTypeIdForXML.ContentTypeID_XML + ".source"; //$NON-NLS-1$;
>+				}
> 			};
> 		}
>     else {
>@@ -243,7 +249,7 @@
>    * @return StructuredTextEditor
>    */
>   protected StructuredTextEditor createTextEditor() {
>-    return new StructuredTextEditorXML();
>+    return new StructuredTextEditor();
>   }
> 
>   public void dispose()
>Index: src/org/eclipse/wst/xsd/ui/internal/XSDTextEditor.java
>===================================================================
>RCS file: /home/webtools/wst/components/xsd/plugins/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/XSDTextEditor.java,v
>retrieving revision 1.19
>diff -u -r1.19 XSDTextEditor.java
>--- src/org/eclipse/wst/xsd/ui/internal/XSDTextEditor.java	13 Sep 2005 20:57:48 -0000	1.19
>+++ src/org/eclipse/wst/xsd/ui/internal/XSDTextEditor.java	14 Sep 2005 06:18:48 -0000
>@@ -17,8 +17,6 @@
> import org.eclipse.core.resources.IFile;
> import org.eclipse.core.runtime.Platform;
> import org.eclipse.jface.action.IMenuManager;
>-import org.eclipse.jface.text.source.ISourceViewer;
>-import org.eclipse.jface.text.source.IVerticalRuler;
> import org.eclipse.jface.viewers.ISelectionChangedListener;
> import org.eclipse.jface.viewers.SelectionChangedEvent;
> import org.eclipse.jface.viewers.StructuredSelection;
>@@ -26,20 +24,18 @@
> import org.eclipse.swt.events.KeyAdapter;
> import org.eclipse.swt.events.KeyEvent;
> import org.eclipse.swt.widgets.Composite;
>-import org.eclipse.ui.IEditorInput;
> import org.eclipse.ui.actions.ActionContext;
> import org.eclipse.ui.actions.ActionGroup;
> import org.eclipse.ui.texteditor.ITextEditor;
> import org.eclipse.ui.texteditor.ITextEditorActionConstants;
> import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
> import org.eclipse.ui.views.properties.IPropertySheetPage;
>-import org.eclipse.wst.sse.ui.internal.StructuredTextViewer;
>+import org.eclipse.wst.sse.ui.internal.StructuredTextEditor;
> import org.eclipse.wst.sse.ui.internal.actions.StructuredTextEditorActionConstants;
> import org.eclipse.wst.sse.ui.internal.openon.OpenOnAction;
> import org.eclipse.wst.sse.ui.internal.view.events.INodeSelectionListener;
> import org.eclipse.wst.sse.ui.internal.view.events.NodeSelectionChangedEvent;
> import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
>-import org.eclipse.wst.xml.ui.internal.provisional.StructuredTextEditorXML;
> import org.eclipse.wst.xsd.ui.internal.properties.section.XSDTabbedPropertySheetPage;
> import org.eclipse.wst.xsd.ui.internal.provider.CategoryAdapter;
> import org.eclipse.wst.xsd.ui.internal.provider.XSDAdapterFactoryLabelProvider;
>@@ -54,7 +50,7 @@
> import org.w3c.dom.Node;
> 
> 
>-public class XSDTextEditor extends StructuredTextEditorXML implements INodeSelectionListener, ISelectionChangedListener
>+public class XSDTextEditor extends StructuredTextEditor implements INodeSelectionListener, ISelectionChangedListener
> {
>   protected XSDSelectionManager xsdSelectionManager;
>   protected XSDModelAdapterFactoryImpl xsdModelAdapterFactory;
>@@ -224,15 +220,6 @@
>     }
>   }
> 
>-  
>-  /*
>-   * @see ITextEditor#doRevertToSaved()
>-   */
>-  public void doRevertToSaved()
>-  {
>-    super.doRevertToSaved();
>-  }
>-
>   /*
>    * @see StructuredTextEditor#update()
>    */
>@@ -263,37 +250,6 @@
>     });
>   }
> 
>- // private static Color dividerColor;
>-
>-	protected ISourceViewer createSourceViewer(Composite parent, IVerticalRuler verticalRuler, int styles) {
>-
>-		fAnnotationAccess= createAnnotationAccess();
>-		fOverviewRuler= createOverviewRuler(getSharedColors());
>-
>-		StructuredTextViewer sourceViewer = createStructedTextViewer(parent, verticalRuler, styles);
>-		initSourceViewer(sourceViewer);
>-
>-    // end of super createSourceViewer
>-		
>-    //StructuredAnnotationAccess annotationAccess = new StructuredAnnotationAccess();
>-	 // DefaultMarkerAnnotationAccess annotationAccess = new DefaultMarkerAnnotationAccess();
>-		
>-	//  ISharedTextColors sharedColors = getTextColorsCache();
>-////  fOverviewRuler = new OverviewRuler(annotationAccess, OVERVIEW_RULER_WIDTH, sharedColors);
>-	//  fOverviewRuler = new OverviewRuler(createAnnotationAccess(), 12, sharedColors);
>-	  
>-//	  fOverviewRuler.addHeaderAnnotationType(StructuredAnnotationType.ERROR);
>-//	  fOverviewRuler.addHeaderAnnotationType(StructuredAnnotationType.WARNING);
>-	  
>-	 // fSourceViewerDecorationSupport = new SourceViewerDecorationSupport(sourceViewer, fOverviewRuler, annotationAccess, sharedColors);
>-    //configureSourceViewerDecorationSupport(fSourceViewerDecorationSupport);    
>-
>-// The following method was removed
>-//    sourceViewer.setEditor(this);
>-
>-		return sourceViewer;
>-	}
>-
>   protected IFile file;
> 
> 
>@@ -310,14 +266,6 @@
>   {
>     return (XSDEditor)getEditorPart();
>   }
>- 
>-  /**
>-   * @see org.eclipse.ui.texteditor.AbstractTextEditor#safelySanityCheckState(IEditorInput)
>-   */
>-	public void safelySanityCheckState(IEditorInput input)
>-  {
>-    super.safelySanityCheckState(input);
>-  }
> 
>   protected class WrappedOpenFileAction extends OpenOnAction
>   {
>Index: src/org/eclipse/wst/xsd/ui/internal/graph/BaseGraphicalViewer.java
>===================================================================
>RCS file: /home/webtools/wst/components/xsd/plugins/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/graph/BaseGraphicalViewer.java,v
>retrieving revision 1.3
>diff -u -r1.3 BaseGraphicalViewer.java
>--- src/org/eclipse/wst/xsd/ui/internal/graph/BaseGraphicalViewer.java	1 Feb 2005 04:12:49 -0000	1.3
>+++ src/org/eclipse/wst/xsd/ui/internal/graph/BaseGraphicalViewer.java	14 Sep 2005 06:18:48 -0000
>@@ -107,7 +107,7 @@
>     editDomain.addViewer(this);
>   
>     //jvh - gef port - moved this from below so it is available when adding context menu below
>-    menuProvider = new GraphContextMenuProvider(this, menuSelectionProvider, editor.getXSDTextEditor());
>+    menuProvider = new GraphContextMenuProvider(this, menuSelectionProvider);
>     setContextMenu(menuProvider);
>   
>     // add context menu to the graph
>Index: src/org/eclipse/wst/xsd/ui/internal/graph/GraphContextMenuProvider.java
>===================================================================
>RCS file: /home/webtools/wst/components/xsd/plugins/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/graph/GraphContextMenuProvider.java,v
>retrieving revision 1.2
>diff -u -r1.2 GraphContextMenuProvider.java
>--- src/org/eclipse/wst/xsd/ui/internal/graph/GraphContextMenuProvider.java	21 Dec 2004 16:26:51 -0000	1.2
>+++ src/org/eclipse/wst/xsd/ui/internal/graph/GraphContextMenuProvider.java	14 Sep 2005 06:18:48 -0000
>@@ -15,7 +15,6 @@
> import org.eclipse.jface.action.IMenuManager;
> import org.eclipse.jface.viewers.ISelectionProvider;
> import org.eclipse.wst.xsd.ui.internal.XSDMenuListener;
>-import org.eclipse.wst.xsd.ui.internal.XSDTextEditor;
> 
> 
> public class GraphContextMenuProvider extends ContextMenuProvider
>@@ -30,8 +29,7 @@
>    */
>   public GraphContextMenuProvider(
>     EditPartViewer viewer,
>-    ISelectionProvider selectionProvider,
>-    XSDTextEditor editor)
>+    ISelectionProvider selectionProvider)
>   {
>     super(viewer);
>     this.viewer = viewer;

Actions: View | Diff

Attachments on bug 109468: 27089 | 27090 | 27091 | 27092 | 27093 | 27094 | 27095 | 27128