woproject/projects/wolips/plugins/org.objectstyle.wolips.componenteditor/java/org/objectstyle/wolips/componenteditor/editor ComponentEditorPart.java,1.3,1.4 HTMLOutlineSelectionHandler.java,1.1,1.2

Update of /cvsroot/woproject/woproject/projects/wolips/plugins/org.objectstyle.wolips.componenteditor/java/org/objectstyle/wolips/componenteditor/editor
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26984/java/org/objectstyle/wolips/componenteditor/editor

Modified Files:
	ComponentEditorPart.java HTMLOutlineSelectionHandler.java 
Log Message:
eclipse 3.2M4 wtp1.0

Index: ComponentEditorPart.java
===================================================================
RCS file: /cvsroot/woproject/woproject/projects/wolips/plugins/org.objectstyle.wolips.componenteditor/java/org/objectstyle/wolips/componenteditor/editor/ComponentEditorPart.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ComponentEditorPart.java	19 Oct 2005 07:41:52 -0000	1.3
+++ ComponentEditorPart.java	26 Dec 2005 13:17:02 -0000	1.4
@@ -47,6 +47,7 @@
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jdt.internal.ui.javaeditor.CompilationUnitEditor;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.ISelectionProvider;
 import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
@@ -58,15 +59,18 @@
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Listener;
+import org.eclipse.ui.IEditorActionBarContributor;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.IEditorSite;
 import org.eclipse.ui.IPropertyListener;
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.ide.IGotoMarker;
+import org.eclipse.ui.part.MultiPageEditorActionBarContributor;
 import org.eclipse.ui.part.MultiPageEditorPart;
+import org.eclipse.ui.part.MultiPageSelectionProvider;
 import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
-import org.eclipse.wst.sse.ui.internal.contentoutline.StructuredTextEditorContentOutlinePage;
+import org.eclipse.wst.sse.ui.internal.contentoutline.ConfigurableContentOutlinePage;
 import org.objectstyle.wolips.apieditor.editor.ApiEditor;
 import org.objectstyle.wolips.componenteditor.ComponenteditorPlugin;
 import org.objectstyle.wolips.components.input.ComponentEditorInput;
@@ -160,17 +164,18 @@
 			switch (i) {
 			case 0:
 				compilationUnitEditor = new CompilationUnitEditor() {
-				public Object getAdapter(Class adapter) {
-					if (adapter.equals(IGotoMarker.class)) {
+					public Object getAdapter(Class adapter) {
+						if (adapter.equals(IGotoMarker.class)) {
+							return super.getAdapter(adapter);
+						}
 						return super.getAdapter(adapter);
 					}
-					return super.getAdapter(adapter);
-				}
-				public void gotoMarker(IMarker marker) {
-					super.gotoMarker(marker);
-				}
-				
-			};
+
+					public void gotoMarker(IMarker marker) {
+						super.gotoMarker(marker);
+					}
+
+				};
 				editorPart = compilationUnitEditor;
 				try {
 					this.addPage(editorPart, editorInput[i]);
@@ -245,12 +250,14 @@
 			editorParts[i] = editorPart;
 
 		}
-		StructuredTextEditorContentOutlinePage contentOutlinePage = null;
-		contentOutlinePage = (StructuredTextEditorContentOutlinePage) structuredTextEditorHTMLWithWebObjectTags
+		ConfigurableContentOutlinePage contentOutlinePage = null;
+		contentOutlinePage = (ConfigurableContentOutlinePage) structuredTextEditorHTMLWithWebObjectTags
 				.getAdapter(IContentOutlinePage.class);
 		addWebObjectsTagNamesListener();
 		if (contentOutlinePage != null) {
-			new HTMLOutlineSelectionHandler(contentOutlinePage, wodEditor);
+			contentOutlinePage
+					.addSelectionChangedListener(new HTMLOutlineSelectionHandler(
+							wodEditor));
 		}
 		CTabFolder tabFolder = (CTabFolder) this.getContainer();
 		tabFolder.addSelectionListener(new SelectionListener() {
@@ -393,4 +400,33 @@
 			}
 		});
 	}
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.ui.part.MultiPageEditorPart#pageChange(int)
+	 * 
+	 * Because of a assert error we have to overwrite this method
+	 */
+	protected void pageChange(int newPageIndex) {
+        setFocus();
+        IEditorPart activeEditor = getEditor(newPageIndex);
+        IEditorActionBarContributor contributor = getEditorSite()
+                .getActionBarContributor();
+        if (contributor != null
+                && contributor instanceof MultiPageEditorActionBarContributor) {
+            ((MultiPageEditorActionBarContributor) contributor)
+                    .setActivePage(activeEditor);
+        }
+        if (activeEditor != null) {
+			ISelectionProvider selectionProvider = activeEditor.getSite()
+					.getSelectionProvider();
+			if (selectionProvider != null && selectionProvider.getSelection() != null) {
+				SelectionChangedEvent event = new SelectionChangedEvent(
+						selectionProvider, selectionProvider.getSelection());
+				MultiPageSelectionProvider provider = (MultiPageSelectionProvider) getSite()
+						.getSelectionProvider();
+				provider.fireSelectionChanged(event);
+				provider.firePostSelectionChanged(event);
+			}
+		}
+    }
 }

Index: HTMLOutlineSelectionHandler.java
===================================================================
RCS file: /cvsroot/woproject/woproject/projects/wolips/plugins/org.objectstyle.wolips.componenteditor/java/org/objectstyle/wolips/componenteditor/editor/HTMLOutlineSelectionHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- HTMLOutlineSelectionHandler.java	2 Oct 2005 14:33:54 -0000	1.1
+++ HTMLOutlineSelectionHandler.java	26 Dec 2005 13:17:02 -0000	1.2
@@ -45,24 +45,25 @@
 
 import java.util.List;
 
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.wst.html.core.internal.document.ElementStyleImpl;
-import org.eclipse.wst.sse.ui.internal.contentoutline.StructuredTextEditorContentOutlinePage;
-import org.eclipse.wst.sse.ui.internal.view.events.INodeSelectionListener;
 import org.eclipse.wst.sse.ui.internal.view.events.NodeSelectionChangedEvent;
 import org.objectstyle.wolips.wodclipse.wod.WodEditor;
 
-public class HTMLOutlineSelectionHandler implements INodeSelectionListener {
+public class HTMLOutlineSelectionHandler implements ISelectionChangedListener {
 	private WodEditor wodEditor;
 
-	public HTMLOutlineSelectionHandler(
-			StructuredTextEditorContentOutlinePage contentOutlinePage,
-			WodEditor wodEditor) {
+	public HTMLOutlineSelectionHandler(WodEditor wodEditor) {
 		super();
 		this.wodEditor = wodEditor;
-		contentOutlinePage.getViewerSelectionManager()
-				.addNodeSelectionListener(this);
 	}
 
+
+	public void selectionChanged(SelectionChangedEvent event) {
+		event.getSelection();
+		
+	}
 	public void nodeSelectionChanged(NodeSelectionChangedEvent event) {
 
 		List nodes = event.getSelectedNodes();
@@ -71,7 +72,9 @@
 			if (object instanceof ElementStyleImpl) {
 				ElementStyleImpl elementStyleImpl = (ElementStyleImpl) object;
 				String tagName = elementStyleImpl.getTagName();
-				if (tagName != null && "webobject".equalsIgnoreCase(tagName)) {
+				if (tagName != null
+						&& ("webobject".equalsIgnoreCase(tagName) || "webobjects"
+								.equalsIgnoreCase(tagName))) {
 					this.changeWodSelection(elementStyleImpl);
 
 				}
@@ -85,4 +88,5 @@
 			wodEditor.selectTagNamed(webobjectTagName);
 		}
 	}
+
 }
\ No newline at end of file



-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems?  Stop!  Download the new AJAX search engine that makes
searching your log files as easy as surfing the  web.  DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click