Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Launch shortcuts work from scratchpad too
Remove redundant code from scratchpad
  • Loading branch information
jakobc committed Feb 25, 2013
1 parent 0278bcd commit e9b93ef
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 64 deletions.
Expand Up @@ -26,8 +26,6 @@
import org.eclipse.jface.text.information.IInformationProviderExtension2;
import org.eclipse.jface.text.information.InformationPresenter;
import org.eclipse.jface.text.source.ISourceViewer;
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.search.ui.IContextMenuConstants;
import org.eclipse.swt.custom.StyledText;
Expand Down Expand Up @@ -58,7 +56,6 @@
import org.erlide.ui.actions.OpenAction;
import org.erlide.ui.editors.erl.AbstractErlangEditor;
import org.erlide.ui.editors.erl.ColorManager;
import org.erlide.ui.editors.erl.ErlangEditor;
import org.erlide.ui.editors.erl.ErlangEditorMessages;
import org.erlide.ui.editors.erl.ErlangSourceViewerConfiguration;
import org.erlide.ui.editors.erl.IErlangEditorActionDefinitionIds;
Expand All @@ -77,7 +74,6 @@ public class ErlangScratchPad extends AbstractErlangEditor implements

private ColorManager colorManager;
private InformationPresenter fInformationPresenter;
private ProjectionSupport fProjectionSupport;
private IErlangFoldingStructureProvider fProjectionModelUpdater;
private CompositeActionGroup fActionGroups;
private CompositeActionGroup fContextMenuGroup;
Expand Down Expand Up @@ -182,51 +178,6 @@ public void createPartControl(final Composite parent) {
.getConfiguredDocumentPartitioning(getSourceViewer()));
}

@Override
protected ISourceViewer createSourceViewer(final Composite parent,
final IVerticalRuler ruler, final int styles) {
final ISourceViewer viewer = new ProjectionViewer(parent, ruler,
getOverviewRuler(), true, styles);
getSourceViewerDecorationSupport(viewer);

/*
* This is a performance optimization to reduce the computation of the
* text presentation triggered by {@link #setVisibleDocument(IDocument)}
*/
// if (javaSourceViewer != null && isFoldingEnabled() && (store == null
// ||
// !store.getBoolean(PreferenceConstants.EDITOR_SHOW_SEGMENTS)))
// javaSourceViewer.prepareDelayedProjection();
if (ErlangEditor.isFoldingEnabled()) {
final ProjectionViewer projectionViewer = (ProjectionViewer) viewer;
fProjectionSupport = new ProjectionSupport(projectionViewer,
getAnnotationAccess(), getSharedColors());
fProjectionSupport
.addSummarizableAnnotationType("org.eclipse.ui.workbench.texteditor.error"); //$NON-NLS-1$
fProjectionSupport
.addSummarizableAnnotationType("org.eclipse.ui.workbench.texteditor.warning"); //$NON-NLS-1$
// TODO fProjectionSupport.setHoverControlCreator(new
// IInformationControlCreator()
// {
// public IInformationControl createInformationControl(Shell shell)
// {
// return new CustomSourceInformationControl(shell,
// IDocument.DEFAULT_CONTENT_TYPE);
// }
// });

fProjectionSupport.install();

fProjectionModelUpdater = ErlideUIPlugin.getDefault()
.getFoldingStructureProviderRegistry()
.getCurrentFoldingProvider();
if (fProjectionModelUpdater != null) {
fProjectionModelUpdater.install(this, projectionViewer);
}
}
return viewer;
}

@Override
protected void createActions() {
super.createActions();
Expand Down
Expand Up @@ -42,7 +42,6 @@
import org.erlide.model.root.IErlProject;
import org.erlide.model.util.ModelUtils;
import org.erlide.ui.editors.erl.AbstractErlangEditor;
import org.erlide.ui.editors.erl.ErlangEditor;
import org.erlide.utils.ErlLogger;
import org.erlide.utils.ListsUtils;
import org.erlide.utils.StringUtils;
Expand Down Expand Up @@ -113,21 +112,18 @@ private Collection<IErlProject> getDependentProjects(
@Override
public void launch(final IEditorPart editor, final String mode) {
ErlLogger.debug("** Launch :: " + editor.getTitle());
if (editor instanceof ErlangEditor) {
if (editor instanceof AbstractErlangEditor) {
final AbstractErlangEditor erlangEditor = (AbstractErlangEditor) editor;
final IErlModule module = erlangEditor.getModule();
if (module != null) {
final IErlProject project = ModelUtils.getProject(module);
if (project != null) {
try {
doLaunch(mode, Lists.newArrayList(project));
} catch (final CoreException e) {
final IWorkbench workbench = PlatformUI.getWorkbench();
final Shell shell = workbench
.getActiveWorkbenchWindow().getShell();
MessageDialog.openError(shell, "Error", e.getStatus()
.getMessage());
}
final IErlProject project = erlangEditor.getProject();
if (project != null) {
try {
doLaunch(mode, Lists.newArrayList(project));
} catch (final CoreException e) {
final IWorkbench workbench = PlatformUI.getWorkbench();
final Shell shell = workbench.getActiveWorkbenchWindow()
.getShell();
MessageDialog.openError(shell, "Error", e.getStatus()
.getMessage());
}
}
}
Expand Down

0 comments on commit e9b93ef

Please sign in to comment.