You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by jo...@apache.org on 2011/11/23 16:05:23 UTC
svn commit: r1205428 - in
/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor:
CasEditorView.java SubPageSite.java outline/OutlinePageBook.java
Author: joern
Date: Wed Nov 23 15:05:22 2011
New Revision: 1205428
URL: http://svn.apache.org/viewvc?rev=1205428&view=rev
Log:
UIMA-2225 Now uses correct action bar for contained view page.
Added:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/SubPageSite.java (with props)
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CasEditorView.java
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/OutlinePageBook.java
Modified: uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CasEditorView.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CasEditorView.java?rev=1205428&r1=1205427&r2=1205428&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CasEditorView.java (original)
+++ uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/CasEditorView.java Wed Nov 23 15:05:22 2011
@@ -23,9 +23,11 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.uima.cas.CAS;
+import org.apache.uima.caseditor.CasEditorPlugin;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IPartListener;
import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.PartInitException;
import org.eclipse.ui.part.IPage;
import org.eclipse.ui.part.IPageBookViewPage;
import org.eclipse.ui.part.MessagePage;
@@ -93,7 +95,12 @@ public abstract class CasEditorView exte
IPageBookViewPage page = doCreatePage(editor);
if (page != null) {
- initPage(page);
+ try {
+ page.init(new SubPageSite(casViewPageBookedPage.getSite()));
+ } catch (PartInitException e) {
+ CasEditorPlugin.log(e);
+ }
+
casViewPageBookedPage.setCASViewPage(page);
}
else {
@@ -150,6 +157,7 @@ public abstract class CasEditorView exte
casViewPageBookedPage = new CasEditorViewPage(editorNotAvailableMessage);
initPage(casViewPageBookedPage);
+
casViewPageBookedPage.createControl(getPageBook());
createViewPage(editor);
Added: uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/SubPageSite.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/SubPageSite.java?rev=1205428&view=auto
==============================================================================
--- uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/SubPageSite.java (added)
+++ uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/SubPageSite.java Wed Nov 23 15:05:22 2011
@@ -0,0 +1,87 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.uima.caseditor.editor;
+
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IActionBars;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.SubActionBars;
+import org.eclipse.ui.part.IPageSite;
+
+public class SubPageSite implements IPageSite {
+
+ private final IPageSite site;
+
+ private SubActionBars subActionBars;
+ private ISelectionProvider selectionProvider;
+
+ public SubPageSite(IPageSite site) {
+ this.site = site;
+ }
+
+ public boolean hasService(@SuppressWarnings("rawtypes") Class api) {
+ return site.hasService(api);
+ }
+
+ public Object getService(@SuppressWarnings("rawtypes") Class api) {
+ return site.getService(api);
+ }
+
+ public Object getAdapter(@SuppressWarnings("rawtypes") Class adapter) {
+ return site.getAdapter(adapter);
+ }
+
+ public void setSelectionProvider(ISelectionProvider provider) {
+ selectionProvider = provider;
+ }
+
+ public IWorkbenchWindow getWorkbenchWindow() {
+ return site.getWorkbenchWindow();
+ }
+
+ public Shell getShell() {
+ return site.getShell();
+ }
+
+ public ISelectionProvider getSelectionProvider() {
+ return selectionProvider;
+ }
+
+ public IWorkbenchPage getPage() {
+ return site.getPage();
+ }
+
+ public void registerContextMenu(String menuId, MenuManager menuManager,
+ ISelectionProvider selectionProvider) {
+ site.registerContextMenu(menuId, menuManager, selectionProvider);
+ }
+
+ public IActionBars getActionBars() {
+
+ if (subActionBars == null) {
+ subActionBars = new SubActionBars(site.getActionBars());
+ }
+
+ return subActionBars;
+ }
+}
\ No newline at end of file
Propchange: uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/SubPageSite.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/OutlinePageBook.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/OutlinePageBook.java?rev=1205428&r1=1205427&r2=1205428&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/OutlinePageBook.java (original)
+++ uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/outline/OutlinePageBook.java Wed Nov 23 15:05:22 2011
@@ -21,16 +21,10 @@ package org.apache.uima.caseditor.editor
import org.apache.uima.caseditor.CasEditorPlugin;
import org.apache.uima.caseditor.editor.CasEditorViewPage;
-import org.eclipse.jface.action.MenuManager;
+import org.apache.uima.caseditor.editor.SubPageSite;
import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.SubActionBars;
import org.eclipse.ui.part.IPageBookViewPage;
import org.eclipse.ui.part.IPageSite;
import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
@@ -38,72 +32,19 @@ import org.eclipse.ui.views.contentoutli
public class OutlinePageBook extends CasEditorViewPage
implements IContentOutlinePage, ISelectionChangedListener {
- private final class SubPageSite implements IPageSite {
-
- private SubActionBars subActionBars;
- private ISelectionProvider selectionProvider;
-
- public boolean hasService(@SuppressWarnings("rawtypes") Class api) {
- return getSite().hasService(api);
- }
-
- public Object getService(@SuppressWarnings("rawtypes") Class api) {
- return getSite().getService(api);
- }
-
- public Object getAdapter(@SuppressWarnings("rawtypes") Class adapter) {
- return getSite().getAdapter(adapter);
- }
-
- public void setSelectionProvider(ISelectionProvider provider) {
- selectionProvider = provider;
- }
-
- public IWorkbenchWindow getWorkbenchWindow() {
- return getSite().getWorkbenchWindow();
- }
-
- public Shell getShell() {
- return getSite().getShell();
- }
-
- public ISelectionProvider getSelectionProvider() {
- return selectionProvider;
- }
-
- public IWorkbenchPage getPage() {
- return getSite().getPage();
- }
-
- public void registerContextMenu(String menuId, MenuManager menuManager,
- ISelectionProvider selectionProvider) {
- getSite().registerContextMenu(menuId, menuManager, selectionProvider);
- }
-
- public IActionBars getActionBars() {
-
- if (subActionBars == null) {
- subActionBars = new SubActionBars(getSite().getActionBars());
- }
-
- return subActionBars;
- }
- }
-
private Viewer viewer;
public OutlinePageBook() {
super("An outline it not available!");
}
-
@Override
protected void initializeAndShowPage(final IPageBookViewPage page) {
if (viewer != null)
viewer.removeSelectionChangedListener(this);
- IPageSite site = new SubPageSite();
+ IPageSite site = new SubPageSite(getSite());
if (book != null && page != null) {
try {