X-Git-Url: http://git.phpeclipse.com diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/views/PHPConsole.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/views/PHPConsole.java index 40e2fce..8406b8e 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/views/PHPConsole.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/views/PHPConsole.java @@ -14,29 +14,41 @@ Contributors: import java.io.IOException; import java.io.InputStream; -import java.text.MessageFormat; +import net.sourceforge.phpdt.internal.ui.PHPUiImages; import net.sourceforge.phpeclipse.PHPeclipsePlugin; import net.sourceforge.phpeclipse.actions.PHPActionMessages; -import org.eclipse.core.runtime.CoreException; + import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; -import org.eclipse.jface.action.IAction; -import org.eclipse.jface.preference.IPreferenceStore; +import org.eclipse.jface.action.Action; +import org.eclipse.jface.action.IMenuListener; +import org.eclipse.jface.action.IMenuManager; +import org.eclipse.jface.action.IToolBarManager; +import org.eclipse.jface.action.MenuManager; +import org.eclipse.jface.action.Separator; +import org.eclipse.jface.resource.JFaceResources; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.Document; import org.eclipse.jface.text.TextViewer; -import org.eclipse.jface.viewers.ISelection; import org.eclipse.swt.SWT; +import org.eclipse.swt.custom.StyledText; +import org.eclipse.swt.events.ModifyEvent; +import org.eclipse.swt.events.ModifyListener; +import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.events.SelectionListener; import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Combo; import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.Menu; +import org.eclipse.ui.IActionBars; +import org.eclipse.ui.IWorkbenchActionConstants; import org.eclipse.ui.IWorkbenchPage; -import org.eclipse.ui.IWorkbenchWindow; -import org.eclipse.ui.IWorkbenchWindowActionDelegate; import org.eclipse.ui.PartInitException; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.part.ViewPart; -import sun.security.krb5.internal.crypto.e; /** * The PHPConsole is used to display the output if you start MySQL/Apache @@ -45,10 +57,39 @@ import sun.security.krb5.internal.crypto.e; public class PHPConsole extends ViewPart { public static final String CONSOLE_ID = "net.sourceforge.phpeclipse.views.phpconsoleview"; + private int COMMAND_COMBO_SIZE = 10; - private TextViewer viewer = null; - private Document document = null; + private TextViewer fViewer = null; + private Document fDocument = null; + private StyledText fStyledText; + private Combo fCommandCombo; + // private Action goAction; + private Action cutAction = new Action() { + public void run() { + fViewer.getTextWidget().cut(); + } + }; + private Action copyAction = new Action() { + public void run() { + fStyledText.copy(); + } + }; + private Action pasteAction = new Action() { + public void run() { + fViewer.getTextWidget().paste(); + } + }; + private Action selectAllAction = new Action() { + public void run() { + fStyledText.selectAll(); + } + }; + private Action clearAction = new Action() { + public void run() { + fStyledText.setText(""); + } + }; /** * The constructor. */ @@ -60,12 +101,144 @@ public class PHPConsole extends ViewPart { * @see ViewPart#createPartControl */ public void createPartControl(Composite parent) { - viewer = new TextViewer(parent, SWT.WRAP | SWT.V_SCROLL | SWT.H_SCROLL); + Composite container = new Composite(parent, SWT.NULL); + // control = container; + GridLayout layout = new GridLayout(); + layout.marginWidth = 0; + layout.marginHeight = 0; + layout.verticalSpacing = 0; + container.setLayout(layout); + Composite navContainer = new Composite(container, SWT.NONE); + layout = new GridLayout(); + layout.numColumns = 2; + layout.marginHeight = 1; + navContainer.setLayout(layout); + createCommandBar(navContainer); + navContainer.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + + fViewer = new TextViewer(container, SWT.WRAP | SWT.V_SCROLL | SWT.H_SCROLL); GridData viewerData = new GridData(GridData.FILL_BOTH); - viewer.getControl().setLayoutData(viewerData); - viewer.setEditable(false); + fViewer.getControl().setLayoutData(viewerData); + fViewer.setEditable(true); + + fStyledText = fViewer.getTextWidget(); + fStyledText.setFont(JFaceResources.getFontRegistry().get(JFaceResources.TEXT_FONT)); + + cutAction.setText("Cut"); + copyAction.setText("Copy"); + pasteAction.setText("Paste"); + selectAllAction.setText("Select All"); + clearAction.setText("Clear PHP Console"); + clearAction.setImageDescriptor(PHPUiImages.DESC_CLEAR); + clearAction.setToolTipText("Clear PHP Console"); + + IActionBars bars = this.getViewSite().getActionBars(); + bars.setGlobalActionHandler(IWorkbenchActionConstants.CUT, cutAction); + bars.setGlobalActionHandler(IWorkbenchActionConstants.COPY, copyAction); + bars.setGlobalActionHandler(IWorkbenchActionConstants.PASTE, pasteAction); + + hookContextMenu(); + // hookDoubleClickAction(); + contributeToActionBars(); + + } + + private void createCommandBar(Composite parent) { + Label addressLabel = new Label(parent, SWT.NONE); + addressLabel.setText("Command:"); + + fCommandCombo = new Combo(parent, SWT.DROP_DOWN | SWT.BORDER); + fCommandCombo.addModifyListener(new ModifyListener() { + public void modifyText(ModifyEvent e) { + String text = fCommandCombo.getText(); + // goAction.setEnabled(text.length() > 0); + } + }); + fCommandCombo.addSelectionListener(new SelectionListener() { + public void widgetSelected(SelectionEvent e) { + String text = fCommandCombo.getItem(fCommandCombo.getSelectionIndex()); + if (text.length() > 0) { + fCommandCombo.setText(text); + // executeCommand(text); + } + } + public void widgetDefaultSelected(SelectionEvent e) { + executeCommand(fCommandCombo.getText()); + } + }); + GridData gd = new GridData(GridData.FILL_HORIZONTAL); + fCommandCombo.setLayoutData(gd); + // ToolBar toolbar = new ToolBar(parent, SWT.FLAT | SWT.HORIZONTAL); + // toolBarManager = new ToolBarManager(toolbar); + // makeActions(); + // IToolBarManager localBar = + // getViewSite().getActionBars().getToolBarManager(); + // localBar.add(backwardAction); + // localBar.add(forwardAction); + } + + private void executeCommand(String command) { + command.trim(); + write( "Test: "+command ); + String[] items = fCommandCombo.getItems(); + int loc = -1; + String normURL = command; + for (int i = 0; i < items.length; i++) { + String normItem = items[i]; + if (normURL.equals(normItem)) { + // match + loc = i; + break; + } + } + if (loc != -1) { + fCommandCombo.remove(loc); + } + fCommandCombo.add(command, 0); + if (fCommandCombo.getItemCount() > COMMAND_COMBO_SIZE) { + fCommandCombo.remove(fCommandCombo.getItemCount() - 1); + } + fCommandCombo.getParent().layout(true); + } + + private void hookContextMenu() { + MenuManager menuMgr = new MenuManager("#PopupMenu"); + menuMgr.setRemoveAllWhenShown(true); + menuMgr.addMenuListener(new IMenuListener() { + public void menuAboutToShow(IMenuManager manager) { + PHPConsole.this.fillContextMenu(manager); + } + }); + Menu menu = menuMgr.createContextMenu(fViewer.getControl()); + fViewer.getControl().setMenu(menu); + getSite().registerContextMenu(menuMgr, fViewer); + } + + private void contributeToActionBars() { + IActionBars bars = getViewSite().getActionBars(); + fillLocalPullDown(bars.getMenuManager()); + fillLocalToolBar(bars.getToolBarManager()); + } + + private void fillLocalPullDown(IMenuManager manager) { + manager.add(cutAction); + manager.add(copyAction); + manager.add(pasteAction); + manager.add(selectAllAction); + } + + private void fillContextMenu(IMenuManager manager) { + manager.add(cutAction); + manager.add(copyAction); + manager.add(pasteAction); + manager.add(selectAllAction); + // Other plug-ins can contribute there actions here + manager.add(new Separator("Additions")); } + private void fillLocalToolBar(IToolBarManager manager) { + manager.add(clearAction); + } /** * Insert the method's description here. * @see ViewPart#setFocus @@ -77,47 +250,53 @@ public class PHPConsole extends ViewPart { * Set the text for the viewer */ public void setOutputText(String text) { - document = new Document(text); - viewer.setDocument(document); + fDocument = new Document(text); + fViewer.setDocument(fDocument); } public void appendOutputText(String text) { try { - if (document == null) { - document = new Document(text); - viewer.setDocument(document); + if (fDocument == null) { + fDocument = new Document(text); + fViewer.setDocument(fDocument); + } else { + fDocument.replace(fDocument.getLength(), 0, text); } - document.replace(document.getLength(), 0, text); } catch (BadLocationException e) { } // viewer.setDocument(document); } - /** - * Prints out the string represented by the string buffer - */ - public static void write(String output) { - try { - IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(); - PHPConsole console = (PHPConsole) page.findView(PHPConsole.CONSOLE_ID); + public static PHPConsole getInstance() { + IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(); + PHPConsole console = (PHPConsole) page.findView(PHPConsole.CONSOLE_ID); + + if (PHPeclipsePlugin.getDefault().getPreferenceStore().getBoolean(PHPeclipsePlugin.SHOW_OUTPUT_IN_CONSOLE) == true) { - if (console != null) { - console.appendOutputText(output); - } else if (PHPeclipsePlugin.getDefault().getPreferenceStore().getBoolean(PHPeclipsePlugin.SHOW_OUTPUT_IN_CONSOLE) == true) { + try { page.showView(PHPConsole.CONSOLE_ID); - console = (PHPConsole) page.findView(PHPConsole.CONSOLE_ID); - console.setOutputText(output); + if (console == null) { + console = (PHPConsole) page.findView(PHPConsole.CONSOLE_ID); + } + } catch (PartInitException e) { + PHPeclipsePlugin.getDefault().getLog().log( + new Status( + IStatus.ERROR, + PHPeclipsePlugin.getPluginId(), + 0, + PHPActionMessages.getString("PHPStartApacheAction.consoleViewOpeningProblem"), + e)); } - } catch (PartInitException e) { - PHPeclipsePlugin.getDefault().getLog().log( - new Status( - IStatus.ERROR, - PHPeclipsePlugin.getPluginId(), - 0, - PHPActionMessages.getString("PHPStartApacheAction.consoleViewOpeningProblem"), - e)); + } + return console; + } + /** + * Prints out the string represented by the string buffer + */ + public synchronized void write(String output) { + appendOutputText(output); } /**