X-Git-Url: http://secure.phpeclipse.com diff --git a/archive/net.sourceforge.phpeclipse.wiki/src/net/sourceforge/phpeclipse/wiki/editor/WikiEditor.java b/archive/net.sourceforge.phpeclipse.wiki/src/net/sourceforge/phpeclipse/wiki/editor/WikiEditor.java index 5cd82f8..913b58c 100644 --- a/archive/net.sourceforge.phpeclipse.wiki/src/net/sourceforge/phpeclipse/wiki/editor/WikiEditor.java +++ b/archive/net.sourceforge.phpeclipse.wiki/src/net/sourceforge/phpeclipse/wiki/editor/WikiEditor.java @@ -7,11 +7,7 @@ **********************************************************************************************************************************/ package net.sourceforge.phpeclipse.wiki.editor; -import net.sourceforge.phpeclipse.webbrowser.views.BrowserView; -import net.sourceforge.phpeclipse.wiki.builder.CreatePageAction; import net.sourceforge.phpeclipse.wiki.editor.model.WikipediaSection; -import net.sourceforge.phpeclipse.wiki.editor.model.WikipediaText; -import net.sourceforge.phpeclipse.wiki.preferences.Util; import org.eclipse.jface.action.IAction; import org.eclipse.jface.text.IDocument; @@ -20,10 +16,6 @@ import org.eclipse.jface.text.source.IVerticalRuler; import org.eclipse.jface.text.source.projection.ProjectionSupport; import org.eclipse.jface.text.source.projection.ProjectionViewer; import org.eclipse.swt.widgets.Composite; -import org.eclipse.ui.IEditorInput; -import org.eclipse.ui.IFileEditorInput; -import org.eclipse.ui.IViewPart; -import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.texteditor.AbstractDecoratedTextEditor; import org.eclipse.ui.texteditor.ITextEditorActionDefinitionIds; import org.eclipse.ui.texteditor.TextOperationAction; @@ -60,6 +52,9 @@ public class WikiEditor extends AbstractDecoratedTextEditor { * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) */ public Object getAdapter(Class required) { +// if (IPropertySource.class.equals(required)) { +// return new WPPropertySource(this); +// } if (IContentOutlinePage.class.equals(required)) { if (fOutlinePage == null) fOutlinePage = new WikiOutlinePage(this); @@ -102,8 +97,16 @@ public class WikiEditor extends AbstractDecoratedTextEditor { projectionViewer.doOperation(ProjectionViewer.TOGGLE); fOccurrencesUpdater = new WikiOccurrencesUpdater(this); + + setWordWrap(); } + private void setWordWrap() { + if (getSourceViewer() != null) { + getSourceViewer().getTextWidget().setWordWrap( + WikiEditorPlugin.getDefault().getPreferenceStore().getBoolean(WikiEditorPlugin.EDITOR_WRAP_WORDS)); + } + } /* * @see org.eclipse.ui.texteditor.AbstractDecoratedTextEditor#createSourceViewer(org.eclipse.swt.widgets.Composite, * org.eclipse.jface.text.source.IVerticalRuler, int) @@ -139,25 +142,7 @@ public class WikiEditor extends AbstractDecoratedTextEditor { */ protected void editorSaved() { super.editorSaved(); - // doesn't work here, wikibuilder has to be finished with generating html page - IWorkbenchPage page = WikiEditorPlugin.getDefault().getActivePage(); - try { - IViewPart part = page.findView(BrowserView.ID_BROWSER); - if (part == null) { - part = page.showView(BrowserView.ID_BROWSER); - } else { - // if (bringToTopPreview) { - // page.bringToTop(part); - // } - } - IEditorInput editorInput = null; - editorInput = this.getEditorInput(); - if (editorInput instanceof IFileEditorInput) { - CreatePageAction.createPage(((IFileEditorInput) editorInput).getFile()); - ((BrowserView) part).refresh(); - } - } catch (Exception e) { - } + BrowserUtil.refreshBrowserPreview(this); }