From: jsurfer Date: Sun, 5 Sep 2004 12:08:18 +0000 (+0000) Subject: Added error log to the debug perspective X-Git-Url: http://secure.phpeclipse.com Added error log to the debug perspective --- diff --git a/net.sourceforge.phpeclipse.debug.core/icons/dlcl16/clear.gif b/net.sourceforge.phpeclipse.debug.core/icons/dlcl16/clear.gif new file mode 100644 index 0000000..9ff6416 Binary files /dev/null and b/net.sourceforge.phpeclipse.debug.core/icons/dlcl16/clear.gif differ diff --git a/net.sourceforge.phpeclipse.debug.core/icons/dlcl16/collapseall.gif b/net.sourceforge.phpeclipse.debug.core/icons/dlcl16/collapseall.gif new file mode 100644 index 0000000..7dc0de5 Binary files /dev/null and b/net.sourceforge.phpeclipse.debug.core/icons/dlcl16/collapseall.gif differ diff --git a/net.sourceforge.phpeclipse.debug.core/icons/dlcl16/export_log.gif b/net.sourceforge.phpeclipse.debug.core/icons/dlcl16/export_log.gif new file mode 100644 index 0000000..a5a431e Binary files /dev/null and b/net.sourceforge.phpeclipse.debug.core/icons/dlcl16/export_log.gif differ diff --git a/net.sourceforge.phpeclipse.debug.core/icons/dlcl16/filter_ps.gif b/net.sourceforge.phpeclipse.debug.core/icons/dlcl16/filter_ps.gif new file mode 100644 index 0000000..f6f6219 Binary files /dev/null and b/net.sourceforge.phpeclipse.debug.core/icons/dlcl16/filter_ps.gif differ diff --git a/net.sourceforge.phpeclipse.debug.core/icons/dlcl16/find_obj.gif b/net.sourceforge.phpeclipse.debug.core/icons/dlcl16/find_obj.gif new file mode 100644 index 0000000..f246a63 Binary files /dev/null and b/net.sourceforge.phpeclipse.debug.core/icons/dlcl16/find_obj.gif differ diff --git a/net.sourceforge.phpeclipse.debug.core/icons/dlcl16/import_log.gif b/net.sourceforge.phpeclipse.debug.core/icons/dlcl16/import_log.gif new file mode 100644 index 0000000..f935e22 Binary files /dev/null and b/net.sourceforge.phpeclipse.debug.core/icons/dlcl16/import_log.gif differ diff --git a/net.sourceforge.phpeclipse.debug.core/icons/dlcl16/open_log.gif b/net.sourceforge.phpeclipse.debug.core/icons/dlcl16/open_log.gif new file mode 100644 index 0000000..96d5334 Binary files /dev/null and b/net.sourceforge.phpeclipse.debug.core/icons/dlcl16/open_log.gif differ diff --git a/net.sourceforge.phpeclipse.debug.core/icons/dlcl16/properties.gif b/net.sourceforge.phpeclipse.debug.core/icons/dlcl16/properties.gif new file mode 100644 index 0000000..ec394d6 Binary files /dev/null and b/net.sourceforge.phpeclipse.debug.core/icons/dlcl16/properties.gif differ diff --git a/net.sourceforge.phpeclipse.debug.core/icons/dlcl16/refresh.gif b/net.sourceforge.phpeclipse.debug.core/icons/dlcl16/refresh.gif new file mode 100644 index 0000000..6eafa48 Binary files /dev/null and b/net.sourceforge.phpeclipse.debug.core/icons/dlcl16/refresh.gif differ diff --git a/net.sourceforge.phpeclipse.debug.core/icons/dlcl16/remove.gif b/net.sourceforge.phpeclipse.debug.core/icons/dlcl16/remove.gif new file mode 100644 index 0000000..9e14298 Binary files /dev/null and b/net.sourceforge.phpeclipse.debug.core/icons/dlcl16/remove.gif differ diff --git a/net.sourceforge.phpeclipse.debug.core/icons/dlcl16/restore_log.gif b/net.sourceforge.phpeclipse.debug.core/icons/dlcl16/restore_log.gif new file mode 100644 index 0000000..ab62179 Binary files /dev/null and b/net.sourceforge.phpeclipse.debug.core/icons/dlcl16/restore_log.gif differ diff --git a/net.sourceforge.phpeclipse.debug.core/icons/dlcl16/th_horizontal.gif b/net.sourceforge.phpeclipse.debug.core/icons/dlcl16/th_horizontal.gif new file mode 100644 index 0000000..ce1a29c Binary files /dev/null and b/net.sourceforge.phpeclipse.debug.core/icons/dlcl16/th_horizontal.gif differ diff --git a/net.sourceforge.phpeclipse.debug.core/icons/dlcl16/th_vertical.gif b/net.sourceforge.phpeclipse.debug.core/icons/dlcl16/th_vertical.gif new file mode 100644 index 0000000..a404f8d Binary files /dev/null and b/net.sourceforge.phpeclipse.debug.core/icons/dlcl16/th_vertical.gif differ diff --git a/net.sourceforge.phpeclipse.debug.core/icons/elcl16/clear.gif b/net.sourceforge.phpeclipse.debug.core/icons/elcl16/clear.gif new file mode 100644 index 0000000..6bc10f9 Binary files /dev/null and b/net.sourceforge.phpeclipse.debug.core/icons/elcl16/clear.gif differ diff --git a/net.sourceforge.phpeclipse.debug.core/icons/elcl16/collapseall.gif b/net.sourceforge.phpeclipse.debug.core/icons/elcl16/collapseall.gif new file mode 100644 index 0000000..a2d80a9 Binary files /dev/null and b/net.sourceforge.phpeclipse.debug.core/icons/elcl16/collapseall.gif differ diff --git a/net.sourceforge.phpeclipse.debug.core/icons/elcl16/export_log.gif b/net.sourceforge.phpeclipse.debug.core/icons/elcl16/export_log.gif new file mode 100644 index 0000000..3465699 Binary files /dev/null and b/net.sourceforge.phpeclipse.debug.core/icons/elcl16/export_log.gif differ diff --git a/net.sourceforge.phpeclipse.debug.core/icons/elcl16/filter_ps.gif b/net.sourceforge.phpeclipse.debug.core/icons/elcl16/filter_ps.gif new file mode 100644 index 0000000..3d061d7 Binary files /dev/null and b/net.sourceforge.phpeclipse.debug.core/icons/elcl16/filter_ps.gif differ diff --git a/net.sourceforge.phpeclipse.debug.core/icons/elcl16/find_obj.gif b/net.sourceforge.phpeclipse.debug.core/icons/elcl16/find_obj.gif new file mode 100644 index 0000000..d540a01 Binary files /dev/null and b/net.sourceforge.phpeclipse.debug.core/icons/elcl16/find_obj.gif differ diff --git a/net.sourceforge.phpeclipse.debug.core/icons/elcl16/import_log.gif b/net.sourceforge.phpeclipse.debug.core/icons/elcl16/import_log.gif new file mode 100644 index 0000000..cab213e Binary files /dev/null and b/net.sourceforge.phpeclipse.debug.core/icons/elcl16/import_log.gif differ diff --git a/net.sourceforge.phpeclipse.debug.core/icons/elcl16/open_log.gif b/net.sourceforge.phpeclipse.debug.core/icons/elcl16/open_log.gif new file mode 100644 index 0000000..7e4c583 Binary files /dev/null and b/net.sourceforge.phpeclipse.debug.core/icons/elcl16/open_log.gif differ diff --git a/net.sourceforge.phpeclipse.debug.core/icons/elcl16/properties.gif b/net.sourceforge.phpeclipse.debug.core/icons/elcl16/properties.gif new file mode 100644 index 0000000..1dc19a3 Binary files /dev/null and b/net.sourceforge.phpeclipse.debug.core/icons/elcl16/properties.gif differ diff --git a/net.sourceforge.phpeclipse.debug.core/icons/elcl16/refresh.gif b/net.sourceforge.phpeclipse.debug.core/icons/elcl16/refresh.gif new file mode 100644 index 0000000..e383147 Binary files /dev/null and b/net.sourceforge.phpeclipse.debug.core/icons/elcl16/refresh.gif differ diff --git a/net.sourceforge.phpeclipse.debug.core/icons/elcl16/remove.gif b/net.sourceforge.phpeclipse.debug.core/icons/elcl16/remove.gif new file mode 100644 index 0000000..b6922ac Binary files /dev/null and b/net.sourceforge.phpeclipse.debug.core/icons/elcl16/remove.gif differ diff --git a/net.sourceforge.phpeclipse.debug.core/icons/elcl16/restore_log.gif b/net.sourceforge.phpeclipse.debug.core/icons/elcl16/restore_log.gif new file mode 100644 index 0000000..8c4d765 Binary files /dev/null and b/net.sourceforge.phpeclipse.debug.core/icons/elcl16/restore_log.gif differ diff --git a/net.sourceforge.phpeclipse.debug.core/icons/elcl16/th_horizontal.gif b/net.sourceforge.phpeclipse.debug.core/icons/elcl16/th_horizontal.gif new file mode 100644 index 0000000..d590470 Binary files /dev/null and b/net.sourceforge.phpeclipse.debug.core/icons/elcl16/th_horizontal.gif differ diff --git a/net.sourceforge.phpeclipse.debug.core/icons/elcl16/th_vertical.gif b/net.sourceforge.phpeclipse.debug.core/icons/elcl16/th_vertical.gif new file mode 100644 index 0000000..50a54e0 Binary files /dev/null and b/net.sourceforge.phpeclipse.debug.core/icons/elcl16/th_vertical.gif differ diff --git a/net.sourceforge.phpeclipse.debug.core/icons/eview16/error_log.gif b/net.sourceforge.phpeclipse.debug.core/icons/eview16/error_log.gif new file mode 100644 index 0000000..58873a1 Binary files /dev/null and b/net.sourceforge.phpeclipse.debug.core/icons/eview16/error_log.gif differ diff --git a/net.sourceforge.phpeclipse.debug.core/icons/eview16/event_next.gif b/net.sourceforge.phpeclipse.debug.core/icons/eview16/event_next.gif new file mode 100644 index 0000000..072b184 Binary files /dev/null and b/net.sourceforge.phpeclipse.debug.core/icons/eview16/event_next.gif differ diff --git a/net.sourceforge.phpeclipse.debug.core/icons/eview16/event_prev.gif b/net.sourceforge.phpeclipse.debug.core/icons/eview16/event_prev.gif new file mode 100644 index 0000000..0716475 Binary files /dev/null and b/net.sourceforge.phpeclipse.debug.core/icons/eview16/event_prev.gif differ diff --git a/net.sourceforge.phpeclipse.debug.core/icons/eview16/hide_pane.gif b/net.sourceforge.phpeclipse.debug.core/icons/eview16/hide_pane.gif new file mode 100644 index 0000000..94004ff Binary files /dev/null and b/net.sourceforge.phpeclipse.debug.core/icons/eview16/hide_pane.gif differ diff --git a/net.sourceforge.phpeclipse.debug.core/icons/eview16/horizontal_view.gif b/net.sourceforge.phpeclipse.debug.core/icons/eview16/horizontal_view.gif new file mode 100644 index 0000000..86bfc48 Binary files /dev/null and b/net.sourceforge.phpeclipse.debug.core/icons/eview16/horizontal_view.gif differ diff --git a/net.sourceforge.phpeclipse.debug.core/icons/eview16/registry.gif b/net.sourceforge.phpeclipse.debug.core/icons/eview16/registry.gif new file mode 100644 index 0000000..c2d6375 Binary files /dev/null and b/net.sourceforge.phpeclipse.debug.core/icons/eview16/registry.gif differ diff --git a/net.sourceforge.phpeclipse.debug.core/icons/eview16/vertical_view.gif b/net.sourceforge.phpeclipse.debug.core/icons/eview16/vertical_view.gif new file mode 100644 index 0000000..493c2fb Binary files /dev/null and b/net.sourceforge.phpeclipse.debug.core/icons/eview16/vertical_view.gif differ diff --git a/net.sourceforge.phpeclipse.debug.core/icons/obj16/error_st_obj.gif b/net.sourceforge.phpeclipse.debug.core/icons/obj16/error_st_obj.gif new file mode 100644 index 0000000..0bc6068 Binary files /dev/null and b/net.sourceforge.phpeclipse.debug.core/icons/obj16/error_st_obj.gif differ diff --git a/net.sourceforge.phpeclipse.debug.core/icons/obj16/error_stack.gif b/net.sourceforge.phpeclipse.debug.core/icons/obj16/error_stack.gif new file mode 100644 index 0000000..e61fc24 Binary files /dev/null and b/net.sourceforge.phpeclipse.debug.core/icons/obj16/error_stack.gif differ diff --git a/net.sourceforge.phpeclipse.debug.core/icons/obj16/ext_point_obj.gif b/net.sourceforge.phpeclipse.debug.core/icons/obj16/ext_point_obj.gif new file mode 100644 index 0000000..17f771a Binary files /dev/null and b/net.sourceforge.phpeclipse.debug.core/icons/obj16/ext_point_obj.gif differ diff --git a/net.sourceforge.phpeclipse.debug.core/icons/obj16/ext_points_obj.gif b/net.sourceforge.phpeclipse.debug.core/icons/obj16/ext_points_obj.gif new file mode 100644 index 0000000..52f4e5e Binary files /dev/null and b/net.sourceforge.phpeclipse.debug.core/icons/obj16/ext_points_obj.gif differ diff --git a/net.sourceforge.phpeclipse.debug.core/icons/obj16/extension_obj.gif b/net.sourceforge.phpeclipse.debug.core/icons/obj16/extension_obj.gif new file mode 100644 index 0000000..7f3f595 Binary files /dev/null and b/net.sourceforge.phpeclipse.debug.core/icons/obj16/extension_obj.gif differ diff --git a/net.sourceforge.phpeclipse.debug.core/icons/obj16/extensions_obj.gif b/net.sourceforge.phpeclipse.debug.core/icons/obj16/extensions_obj.gif new file mode 100644 index 0000000..e8abf43 Binary files /dev/null and b/net.sourceforge.phpeclipse.debug.core/icons/obj16/extensions_obj.gif differ diff --git a/net.sourceforge.phpeclipse.debug.core/icons/obj16/generic_xml_obj.gif b/net.sourceforge.phpeclipse.debug.core/icons/obj16/generic_xml_obj.gif new file mode 100644 index 0000000..4083e21 Binary files /dev/null and b/net.sourceforge.phpeclipse.debug.core/icons/obj16/generic_xml_obj.gif differ diff --git a/net.sourceforge.phpeclipse.debug.core/icons/obj16/info_st_obj.gif b/net.sourceforge.phpeclipse.debug.core/icons/obj16/info_st_obj.gif new file mode 100644 index 0000000..2da001e Binary files /dev/null and b/net.sourceforge.phpeclipse.debug.core/icons/obj16/info_st_obj.gif differ diff --git a/net.sourceforge.phpeclipse.debug.core/icons/obj16/java_lib_obj.gif b/net.sourceforge.phpeclipse.debug.core/icons/obj16/java_lib_obj.gif new file mode 100644 index 0000000..cb55e33 Binary files /dev/null and b/net.sourceforge.phpeclipse.debug.core/icons/obj16/java_lib_obj.gif differ diff --git a/net.sourceforge.phpeclipse.debug.core/icons/obj16/ok_st_obj.gif b/net.sourceforge.phpeclipse.debug.core/icons/obj16/ok_st_obj.gif new file mode 100644 index 0000000..9cacb96 Binary files /dev/null and b/net.sourceforge.phpeclipse.debug.core/icons/obj16/ok_st_obj.gif differ diff --git a/net.sourceforge.phpeclipse.debug.core/icons/obj16/plugin_obj.gif b/net.sourceforge.phpeclipse.debug.core/icons/obj16/plugin_obj.gif new file mode 100644 index 0000000..8493df4 Binary files /dev/null and b/net.sourceforge.phpeclipse.debug.core/icons/obj16/plugin_obj.gif differ diff --git a/net.sourceforge.phpeclipse.debug.core/icons/obj16/req_plugin_obj.gif b/net.sourceforge.phpeclipse.debug.core/icons/obj16/req_plugin_obj.gif new file mode 100644 index 0000000..c54f2b3 Binary files /dev/null and b/net.sourceforge.phpeclipse.debug.core/icons/obj16/req_plugin_obj.gif differ diff --git a/net.sourceforge.phpeclipse.debug.core/icons/obj16/req_plugins_obj.gif b/net.sourceforge.phpeclipse.debug.core/icons/obj16/req_plugins_obj.gif new file mode 100644 index 0000000..7f135be Binary files /dev/null and b/net.sourceforge.phpeclipse.debug.core/icons/obj16/req_plugins_obj.gif differ diff --git a/net.sourceforge.phpeclipse.debug.core/icons/obj16/runtime_obj.gif b/net.sourceforge.phpeclipse.debug.core/icons/obj16/runtime_obj.gif new file mode 100644 index 0000000..f159bcd Binary files /dev/null and b/net.sourceforge.phpeclipse.debug.core/icons/obj16/runtime_obj.gif differ diff --git a/net.sourceforge.phpeclipse.debug.core/icons/obj16/warning_st_obj.gif b/net.sourceforge.phpeclipse.debug.core/icons/obj16/warning_st_obj.gif new file mode 100644 index 0000000..2b2e50f Binary files /dev/null and b/net.sourceforge.phpeclipse.debug.core/icons/obj16/warning_st_obj.gif differ diff --git a/net.sourceforge.phpeclipse.debug.core/icons/ovr16/run_co.gif b/net.sourceforge.phpeclipse.debug.core/icons/ovr16/run_co.gif new file mode 100644 index 0000000..13077f9 Binary files /dev/null and b/net.sourceforge.phpeclipse.debug.core/icons/ovr16/run_co.gif differ diff --git a/net.sourceforge.phpeclipse.debug.core/icons/sample.gif b/net.sourceforge.phpeclipse.debug.core/icons/sample.gif new file mode 100644 index 0000000..34fb3c9 Binary files /dev/null and b/net.sourceforge.phpeclipse.debug.core/icons/sample.gif differ diff --git a/net.sourceforge.phpeclipse.debug.core/plugin.properties b/net.sourceforge.phpeclipse.debug.core/plugin.properties index cf8b0bc..e0e0212 100644 --- a/net.sourceforge.phpeclipse.debug.core/plugin.properties +++ b/net.sourceforge.phpeclipse.debug.core/plugin.properties @@ -1,2 +1,7 @@ +Plugin.name=PHPeclipse Debug Core -Plugin.name=PHPEclipse Debug Core +views.category.name = PHPeclipse Debug Core +views.errorLog.name= PHP Debug Log + +ViewCommand.logView.name= PHP Debug Log +ViewCommand.logView.description= Show the PHP Debug Log \ No newline at end of file diff --git a/net.sourceforge.phpeclipse.debug.core/plugin.xml b/net.sourceforge.phpeclipse.debug.core/plugin.xml index d43d005..c384616 100644 --- a/net.sourceforge.phpeclipse.debug.core/plugin.xml +++ b/net.sourceforge.phpeclipse.debug.core/plugin.xml @@ -43,4 +43,35 @@ id="phpLineBreakpoint"> + + + + + + + + + + + + + diff --git a/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/PHPDBGInterface.java b/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/PHPDBGInterface.java index e0e19cc..5433b6b 100644 --- a/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/PHPDBGInterface.java +++ b/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/PHPDBGInterface.java @@ -528,8 +528,8 @@ public class PHPDBGInterface { // To print errors on the console, I must execute a code in the // php context, that write the stderr... I didn't found a better way // TODO: Find a better way???? - String codeExec= ""; - codeExec= "fwrite(fopen('php://stderr', 'w'),\\\"" + error + "\\\");"; +// String codeExec= ""; +// codeExec= "fwrite(fopen('php://stderr', 'w'),\\\"" + error + "\\\");"; // try { // evalBlock("eval(\"" + codeExec + "\");"); // } catch (DebugException e) { diff --git a/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/PHPDBGProxy.java b/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/PHPDBGProxy.java index 1c73cf9..d336d7e 100644 --- a/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/PHPDBGProxy.java +++ b/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/PHPDBGProxy.java @@ -1,445 +1,443 @@ -/********************************************************************** -Copyright (c) 2000, 2002 IBM Corp. and others. -All rights reserved. This program and the accompanying materials -are made available under the terms of the Common Public License v1.0 -which accompanies this distribution, and is available at -http://www.eclipse.org/legal/cpl-v10.html - -Contributors: - IBM Corporation - Initial implementation - Vicente Fernando - www.alfersoft.com.ar - Christian Perkonig - remote debug -**********************************************************************/ +/*********************************************************************************************************************************** + * Copyright (c) 2000, 2002 IBM Corp. and others. All rights reserved. This program and the accompanying materials are made + * available under the terms of the Common Public License v1.0 which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/cpl-v10.html + * + * Contributors: IBM Corporation - Initial implementation Vicente Fernando - www.alfersoft.com.ar Christian Perkonig - remote debug + **********************************************************************************************************************************/ package net.sourceforge.phpdt.internal.debug.core; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; import java.io.OutputStream; -import java.net.Socket; import java.net.ServerSocket; +import java.net.Socket; import java.net.SocketTimeoutException; +import net.sourceforge.phpdt.internal.debug.core.breakpoints.PHPLineBreakpoint; +import net.sourceforge.phpdt.internal.debug.core.logview.LogView; +import net.sourceforge.phpdt.internal.debug.core.model.IPHPDebugTarget; +import net.sourceforge.phpdt.internal.debug.core.model.PHPStackFrame; +import net.sourceforge.phpdt.internal.debug.core.model.PHPThread; +import net.sourceforge.phpdt.internal.debug.core.model.PHPVariable; + import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; -import org.eclipse.debug.core.DebugPlugin; import org.eclipse.debug.core.DebugException; +import org.eclipse.debug.core.DebugPlugin; import org.eclipse.debug.core.model.IBreakpoint; -import net.sourceforge.phpdt.internal.debug.core.model.IPHPDebugTarget; -import net.sourceforge.phpdt.internal.debug.core.model.PHPStackFrame; -import net.sourceforge.phpdt.internal.debug.core.model.PHPThread; -import net.sourceforge.phpdt.internal.debug.core.model.PHPVariable; -import net.sourceforge.phpdt.internal.debug.core.breakpoints.PHPLineBreakpoint; +import org.eclipse.ui.IViewPart; +import org.eclipse.ui.IWorkbenchPage; public class PHPDBGProxy { - private ServerSocket server= null; - private Socket socket; - private BufferedReader reader= null; - private PHPDBGInterface DBGInt= null; - private IPHPDebugTarget debugTarget= null; - private PHPLoop phpLoop; - private PHPThread PHPMainThread; - private PHPDBGProxy thisProxy= null; - private int port; - private boolean remote; - private IPath remoteSourcePath; - - public PHPDBGProxy() { - thisProxy= this; - } - - public PHPDBGProxy(boolean remote,String remoteSourcePath) { - thisProxy= this; - this.remote=remote; - this.remoteSourcePath= new Path(remoteSourcePath); - } - - public void start() { - createServerSocket(); - this.startPHPLoop(); - } - - public void stop() { - phpLoop.setShouldStop(); - if(DBGInt != null) DBGInt.setShouldStop(); - if (!remote) { - try { - getDebugTarget().getProcess().terminate(); - } catch (DebugException e) { - e.printStackTrace(); - } - } - phpLoop.notifyWait(); - } - - protected ServerSocket getServerSocket() throws IOException { - if (server == null) { - createServerSocket(); - } - return server; - } - - protected void createServerSocket() { -// port = SocketUtil.findUnusedLocalPort("localhost", 10001, 10101); - port = 10001; - if (port == -1) { - PHPDebugCorePlugin.log(5, "Cannot find free port!!!!"); - return; - } - try { - if (server == null) { - server = new ServerSocket(port); - //System.out.println("ServerSocket on port: " + port); - } - } catch (IOException e) { - // IO Error - PHPDebugCorePlugin.log(e); - stop(); - } - } - - public Socket getSocket() throws IOException { - return socket; - } - - protected void setDBGInterface(PHPDBGInterface DBGInt) { - this.DBGInt= DBGInt; - } - - public BufferedReader getReader() throws IOException { - if (reader == null) { - reader = new BufferedReader(new InputStreamReader(this.getSocket().getInputStream(), "ISO8859_1")); - } - return reader; - } - - public BufferedReader getReader(Socket socket) throws IOException { - if (socket != null) - return new BufferedReader(new InputStreamReader(socket.getInputStream(), "ISO8859_1")); - else - return null; - } - - public OutputStream getOutputStream() throws IOException { - return this.getSocket().getOutputStream(); - } - - protected void setBreakPoints() throws IOException, CoreException { - IBreakpoint[] breakpoints = DebugPlugin.getDefault().getBreakpointManager().getBreakpoints(); - for (int i = 0; i < breakpoints.length; i++) { - addBreakpoint(breakpoints[i]); - } - } - - public void addBreakpoint(IBreakpoint breakpoint) { - if (DBGInt == null) return; - int bpNo= 0; - try { - PHPLineBreakpoint phpLBP; - if(breakpoint.getModelIdentifier() == PHPDebugCorePlugin.getUniqueIdentifier()) { - IPath filename; - phpLBP= (PHPLineBreakpoint)breakpoint; - // bpNo= DBGInt.addBreakpoint(phpLBP.getMarker().getResource().getLocation().toOSString(), phpLBP.getLineNumber()); - if (remote) - filename=remoteSourcePath.append(phpLBP.getMarker().getResource().getProjectRelativePath()); - else - filename=phpLBP.getMarker().getResource().getLocation(); - bpNo= DBGInt.addBreakpoint(filename.toOSString(), phpLBP.getLineNumber()); - phpLBP.setDBGBpNo(bpNo); - } - } catch (IOException e) { - PHPDebugCorePlugin.log(e); - stop(); - } catch (CoreException e) { - PHPDebugCorePlugin.log(e); - stop(); - } - } - - public void removeBreakpoint(IBreakpoint breakpoint) { - if (DBGInt == null) return; - try { - PHPLineBreakpoint phpLBP; - if(breakpoint.getModelIdentifier() == PHPDebugCorePlugin.getUniqueIdentifier()) { - phpLBP= (PHPLineBreakpoint)breakpoint; - IPath filename; - if (remote) - filename=remoteSourcePath.append(phpLBP.getMarker().getResource().getProjectRelativePath()); - else - filename=phpLBP.getMarker().getResource().getLocation(); -// bpNo= DBGInt.addBreakpoint(filename.toOSString(), phpLBP.getLineNumber()); - DBGInt.removeBreakpoint(filename.toOSString(), phpLBP.getLineNumber(), phpLBP.getDBGBpNo()); - } - } catch (IOException e) { - PHPDebugCorePlugin.log(e); - stop(); - } catch (CoreException e) { - PHPDebugCorePlugin.log(e); - stop(); - } - } - - public void phpLoopNotify (){ - phpLoop.notifyWait(); - } - - public void startPHPLoop() { - phpLoop = new PHPLoop(); - phpLoop.start(); - } - - public void resume() { - try { - DBGInt.continueExecution(); - phpLoop.notifyWait(); - } catch (IOException e) { - PHPDebugCorePlugin.log(e); - stop(); - } - } - - public void pause() { - try { - DBGInt.pauseExecution(); - } catch (IOException e) { - PHPDebugCorePlugin.log(e); - stop(); - } - } - protected IPHPDebugTarget getDebugTarget() { - return debugTarget; - } - - public void setDebugTarget(IPHPDebugTarget debugTarget) { - this.debugTarget = debugTarget; - debugTarget.setPHPDBGProxy(this); - } - - public PHPVariable[] readVariables(PHPStackFrame frame) { - try { - return DBGInt.getVariables(frame); - } catch (IOException ioex) { - ioex.printStackTrace(); - throw new RuntimeException(ioex.getMessage()); - } catch (DebugException ex) { - ex.printStackTrace(); - throw new RuntimeException(ex.getMessage()); - } - } - - public PHPVariable[] eval(PHPStackFrame frame,String evalString) { - try { - return DBGInt.evalBlock(frame,evalString); - // return DBGInt.getVariables(frame); - } catch (IOException ioex) { - ioex.printStackTrace(); - throw new RuntimeException(ioex.getMessage()); - } catch (DebugException ex) { - ex.printStackTrace(); - throw new RuntimeException(ex.getMessage()); - } - } - - public void readStepOverEnd(PHPStackFrame stackFrame) { - try { - DBGInt.stepOver(); - phpLoop.notifyWait(); - } catch (Exception e) { - PHPDebugCorePlugin.log(e); - } - } - - public void readStepReturnEnd(PHPStackFrame stackFrame) { - try { - DBGInt.stepOut(); - phpLoop.notifyWait(); - } catch (Exception e) { - PHPDebugCorePlugin.log(e); - } - } - - public void readStepIntoEnd(PHPStackFrame stackFrame) { - try { - DBGInt.stepInto(); - phpLoop.notifyWait(); - } catch (Exception e) { - PHPDebugCorePlugin.log(e); - } - } - -/* - public PHPStackFrame[] readFrames(PHPThread thread) { - //try { - //this.println("th " + thread.getId() + " ; f "); - //return new FramesReader(getMultiReaderStrategy()).readFrames(thread); - return null; - //} catch (IOException e) { - // PHPDebugCorePlugin.log(e); - // return null; - //} - - } -*/ - - public void closeSocket() throws IOException { - if (socket != null) { - socket.close(); - } - } - - public void closeServerSocket() throws IOException { - if (server != null) { - server.close(); - } - } - - public int getPort() { - return port; - } - - class PHPLoop extends Thread { - private boolean shouldStop; - - public PHPLoop() { - shouldStop = false; - this.setName("PHPDebuggerLoop"); - } - - public synchronized void setShouldStop() { - shouldStop = true; - } - - public synchronized void notifyWait() { - notify(); - } - - public void run() { - try { - char[] buf= new char[16]; - int i, pos, timeout; - long interval= 200; // 200ms - String line; - PHPStackFrame[] StackList; - boolean endFile=false; - boolean newconnect=false; - Socket newSocket=null; - PHPDBGInterface newDBGInt; - int sid=-1; - -// synchronized (this) { -// wait(); -// } - - PHPMainThread = new PHPThread(getDebugTarget(), getPort()); - PHPMainThread.setName("Thread [main]"); - timeout = 0; - -// while ((getDebugTarget() == null) && (timeout < 100)) { -// sleep(100); -// timeout++; -// } - // Be sure debug target is set -// PHPMainThread.setDebugTarget(getDebugTarget()); - getDebugTarget().addThread(PHPMainThread); - - //System.out.println("Waiting for breakpoints."); - while (!shouldStop) - { - newconnect=true; - try { - newSocket = server.accept(); - //System.out.println("Accepted! : " + socket.toString()); - } catch (SocketTimeoutException e) { - // no one wants to connect - newconnect=false; - } catch (IOException e) { - PHPDebugCorePlugin.log(e); - return; - } - - if (newconnect) - { - if (DBGInt==null) - server.setSoTimeout(1); - newDBGInt= new PHPDBGInterface(getReader(newSocket), newSocket.getOutputStream(), thisProxy); - newDBGInt.waitResponse(1000); - newDBGInt.flushAllPackets(); - // Check version and session ID - if ((DBGInt==null) || (DBGInt.getSID()==newDBGInt.getSID())) - { - DBGInt=newDBGInt; - try { - closeSocket(); - } catch (IOException e) { - PHPDebugCorePlugin.log(e); - shouldStop=true; - } - socket=newSocket; - setBreakPoints(); - DBGInt.continueExecution(); - } else - { - newDBGInt.continueExecution(); - newSocket.close(); - } - } - - if(DBGInt.waitResponse(interval)) - { - - DBGInt.flushAllPackets(); - - if (DBGInt.BPUnderHit != 0) { - StackList = DBGInt.getStackList(); - if (StackList.length > 0) { - for (i = 0; i < StackList.length; i++) { - StackList[i].setThread(PHPMainThread); - if (DBGInt.getModByNo(StackList[i].getModNo()).equals("")) { - DBGInt.getSourceTree(); - } - StackList[i].setFile( - DBGInt.getModByNo(StackList[i].getModNo())); - } - PHPMainThread.setStackFrames(StackList); - } - // Fire debug event - PHPMainThread.suspend(); - - synchronized (this) { - wait(); - } - } - } - if (remote) { - if (PHPMainThread.isTerminated()) { - shouldStop=true; - break; - } - } else { - if (PHPMainThread.isTerminated() || getDebugTarget().getProcess().isTerminated()) { - shouldStop=true; - break; - } - } - } - } - catch (Exception ex) { - PHPDebugCorePlugin.log(ex); - System.out.println(ex); - } - finally { - try { - getDebugTarget().terminate(); - closeSocket(); - closeServerSocket(); - } catch (IOException e) { - PHPDebugCorePlugin.log(e); - return; - } + private ServerSocket server = null; + + private Socket socket; + + private BufferedReader reader = null; + + private PHPDBGInterface DBGInt = null; + + private IPHPDebugTarget debugTarget = null; + + private PHPLoop phpLoop; + + private PHPThread PHPMainThread; + + private PHPDBGProxy thisProxy = null; + + private int port; + + private boolean remote; + + private IPath remoteSourcePath; + + public PHPDBGProxy() { + thisProxy = this; + } + + public PHPDBGProxy(boolean remote, String remoteSourcePath) { + thisProxy = this; + this.remote = remote; + this.remoteSourcePath = new Path(remoteSourcePath); + } + + public void start() { + createServerSocket(); + this.startPHPLoop(); + } + + public void stop() { + phpLoop.setShouldStop(); + if (DBGInt != null) + DBGInt.setShouldStop(); + if (!remote) { + try { + getDebugTarget().getProcess().terminate(); + } catch (DebugException e) { + e.printStackTrace(); + } + } + phpLoop.notifyWait(); + } + + protected ServerSocket getServerSocket() throws IOException { + if (server == null) { + createServerSocket(); + } + return server; + } + + protected void createServerSocket() { + // port = SocketUtil.findUnusedLocalPort("localhost", 10001, 10101); + port = 10001; + if (port == -1) { + PHPDebugCorePlugin.log(5, "Cannot find free port!!!!"); + return; + } + try { + if (server == null) { + server = new ServerSocket(port); + //System.out.println("ServerSocket on port: " + port); + } + } catch (IOException e) { + // IO Error + PHPDebugCorePlugin.log(e); + stop(); + } + } + + public Socket getSocket() throws IOException { + return socket; + } + + protected void setDBGInterface(PHPDBGInterface DBGInt) { + this.DBGInt = DBGInt; + } + + public BufferedReader getReader() throws IOException { + if (reader == null) { + reader = new BufferedReader(new InputStreamReader(this.getSocket().getInputStream(), "ISO8859_1")); + } + return reader; + } + + public BufferedReader getReader(Socket socket) throws IOException { + if (socket != null) + return new BufferedReader(new InputStreamReader(socket.getInputStream(), "ISO8859_1")); + else + return null; + } + + public OutputStream getOutputStream() throws IOException { + return this.getSocket().getOutputStream(); + } + + protected void setBreakPoints() throws IOException, CoreException { + IBreakpoint[] breakpoints = DebugPlugin.getDefault().getBreakpointManager().getBreakpoints(); + for (int i = 0; i < breakpoints.length; i++) { + addBreakpoint(breakpoints[i]); + } + } + + public void addBreakpoint(IBreakpoint breakpoint) { + if (DBGInt == null) + return; + int bpNo = 0; + try { + PHPLineBreakpoint phpLBP; + if (breakpoint.getModelIdentifier() == PHPDebugCorePlugin.getUniqueIdentifier()) { + IPath filename; + phpLBP = (PHPLineBreakpoint) breakpoint; + // bpNo= DBGInt.addBreakpoint(phpLBP.getMarker().getResource().getLocation().toOSString(), phpLBP.getLineNumber()); + if (remote) + filename = remoteSourcePath.append(phpLBP.getMarker().getResource().getProjectRelativePath()); + else + filename = phpLBP.getMarker().getResource().getLocation(); + bpNo = DBGInt.addBreakpoint(filename.toOSString(), phpLBP.getLineNumber()); + phpLBP.setDBGBpNo(bpNo); + } + } catch (IOException e) { + PHPDebugCorePlugin.log(e); + stop(); + } catch (CoreException e) { + PHPDebugCorePlugin.log(e); + stop(); + } + } + + public void removeBreakpoint(IBreakpoint breakpoint) { + if (DBGInt == null) + return; + try { + PHPLineBreakpoint phpLBP; + if (breakpoint.getModelIdentifier() == PHPDebugCorePlugin.getUniqueIdentifier()) { + phpLBP = (PHPLineBreakpoint) breakpoint; + IPath filename; + if (remote) + filename = remoteSourcePath.append(phpLBP.getMarker().getResource().getProjectRelativePath()); + else + filename = phpLBP.getMarker().getResource().getLocation(); + // bpNo= DBGInt.addBreakpoint(filename.toOSString(), phpLBP.getLineNumber()); + DBGInt.removeBreakpoint(filename.toOSString(), phpLBP.getLineNumber(), phpLBP.getDBGBpNo()); + } + } catch (IOException e) { + PHPDebugCorePlugin.log(e); + stop(); + } catch (CoreException e) { + PHPDebugCorePlugin.log(e); + stop(); + } + } + + public void phpLoopNotify() { + phpLoop.notifyWait(); + } + + public void startPHPLoop() { + phpLoop = new PHPLoop(); + phpLoop.start(); + } + + public void resume() { + try { + DBGInt.continueExecution(); + phpLoop.notifyWait(); + } catch (IOException e) { + PHPDebugCorePlugin.log(e); + stop(); + } + } + + public void pause() { + try { + DBGInt.pauseExecution(); + } catch (IOException e) { + PHPDebugCorePlugin.log(e); + stop(); + } + } + + protected IPHPDebugTarget getDebugTarget() { + return debugTarget; + } + + public void setDebugTarget(IPHPDebugTarget debugTarget) { + this.debugTarget = debugTarget; + debugTarget.setPHPDBGProxy(this); + } + + public PHPVariable[] readVariables(PHPStackFrame frame) { + try { + return DBGInt.getVariables(frame); + } catch (IOException ioex) { + ioex.printStackTrace(); + throw new RuntimeException(ioex.getMessage()); + } catch (DebugException ex) { + ex.printStackTrace(); + throw new RuntimeException(ex.getMessage()); + } + } + + public PHPVariable[] eval(PHPStackFrame frame, String evalString) { + try { + return DBGInt.evalBlock(frame, evalString); + // return DBGInt.getVariables(frame); + } catch (IOException ioex) { + ioex.printStackTrace(); + throw new RuntimeException(ioex.getMessage()); + } catch (DebugException ex) { + ex.printStackTrace(); + throw new RuntimeException(ex.getMessage()); + } + } + + public void readStepOverEnd(PHPStackFrame stackFrame) { + try { + DBGInt.stepOver(); + phpLoop.notifyWait(); + } catch (Exception e) { + PHPDebugCorePlugin.log(e); + } + } + + public void readStepReturnEnd(PHPStackFrame stackFrame) { + try { + DBGInt.stepOut(); + phpLoop.notifyWait(); + } catch (Exception e) { + PHPDebugCorePlugin.log(e); + } + } + + public void readStepIntoEnd(PHPStackFrame stackFrame) { + try { + DBGInt.stepInto(); + phpLoop.notifyWait(); + } catch (Exception e) { + PHPDebugCorePlugin.log(e); + } + } + + /* + * public PHPStackFrame[] readFrames(PHPThread thread) { //try { //this.println("th " + thread.getId() + " ; f "); //return new + * FramesReader(getMultiReaderStrategy()).readFrames(thread); return null; //} catch (IOException e) { // + * PHPDebugCorePlugin.log(e); // return null; //} + * } + */ + + public void closeSocket() throws IOException { + if (socket != null) { + socket.close(); + } + } + + public void closeServerSocket() throws IOException { + if (server != null) { + server.close(); + } + } + + public int getPort() { + return port; + } + + class PHPLoop extends Thread { + private boolean shouldStop; + + public PHPLoop() { + shouldStop = false; + this.setName("PHPDebuggerLoop"); + } + + public synchronized void setShouldStop() { + shouldStop = true; + } + + public synchronized void notifyWait() { + notify(); + } + + public void run() { + try { + char[] buf = new char[16]; + int i, pos, timeout; + long interval = 200; // 200ms + String line; + PHPStackFrame[] StackList; + boolean endFile = false; + boolean newconnect = false; + Socket newSocket = null; + PHPDBGInterface newDBGInt; + int sid = -1; + + // synchronized (this) { + // wait(); + // } + + PHPMainThread = new PHPThread(getDebugTarget(), getPort()); + PHPMainThread.setName("Thread [main]"); + timeout = 0; + + // while ((getDebugTarget() == null) && (timeout < 100)) { + // sleep(100); + // timeout++; + // } + // Be sure debug target is set + // PHPMainThread.setDebugTarget(getDebugTarget()); + getDebugTarget().addThread(PHPMainThread); + + //System.out.println("Waiting for breakpoints."); + while (!shouldStop) { + newconnect = true; + try { + newSocket = server.accept(); + //System.out.println("Accepted! : " + socket.toString()); + } catch (SocketTimeoutException e) { + // no one wants to connect + newconnect = false; + } catch (IOException e) { + PHPDebugCorePlugin.log(e); + return; + } + + if (newconnect) { + if (DBGInt == null) + server.setSoTimeout(1); + newDBGInt = new PHPDBGInterface(getReader(newSocket), newSocket.getOutputStream(), thisProxy); + newDBGInt.waitResponse(1000); + newDBGInt.flushAllPackets(); + // Check version and session ID + if ((DBGInt == null) || (DBGInt.getSID() == newDBGInt.getSID())) { + DBGInt = newDBGInt; + try { + closeSocket(); + } catch (IOException e) { + PHPDebugCorePlugin.log(e); + shouldStop = true; + } + socket = newSocket; + setBreakPoints(); + DBGInt.continueExecution(); + } else { + newDBGInt.continueExecution(); + newSocket.close(); + } + } + + if (DBGInt.waitResponse(interval)) { + + DBGInt.flushAllPackets(); + + if (DBGInt.BPUnderHit != 0) { + StackList = DBGInt.getStackList(); + if (StackList.length > 0) { + for (i = 0; i < StackList.length; i++) { + StackList[i].setThread(PHPMainThread); + if (DBGInt.getModByNo(StackList[i].getModNo()).equals("")) { + DBGInt.getSourceTree(); + } + StackList[i].setFile(DBGInt.getModByNo(StackList[i].getModNo())); + } + PHPMainThread.setStackFrames(StackList); + } + // Fire debug event + PHPMainThread.suspend(); + + synchronized (this) { + wait(); + } + } + } + if (remote) { + if (PHPMainThread.isTerminated()) { + shouldStop = true; + break; + } + } else { + if (PHPMainThread.isTerminated() || getDebugTarget().getProcess().isTerminated()) { + shouldStop = true; + break; + } + } + } + } catch (Exception ex) { + PHPDebugCorePlugin.log(ex); + System.out.println(ex); + } finally { + try { + getDebugTarget().terminate(); + closeSocket(); + closeServerSocket(); + } catch (IOException e) { + PHPDebugCorePlugin.log(e); + return; + } //System.out.println("Socket loop finished."); - } - } - } -} + } + } + } +} \ No newline at end of file diff --git a/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/PHPDebugCorePlugin.java b/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/PHPDebugCorePlugin.java index 137b708..6fd64ee 100644 --- a/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/PHPDebugCorePlugin.java +++ b/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/PHPDebugCorePlugin.java @@ -1,34 +1,70 @@ package net.sourceforge.phpdt.internal.debug.core; +import java.util.MissingResourceException; +import java.util.ResourceBundle; + +import net.sourceforge.phpdt.internal.debug.core.logview.LogView; import net.sourceforge.phpeclipse.PHPeclipsePlugin; + import org.eclipse.core.resources.IWorkspace; +import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Plugin; import org.eclipse.core.runtime.Status; -//import org.eclipse.core.runtime.*; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.ui.IViewPart; +import org.eclipse.ui.IWorkbenchPage; +import org.eclipse.ui.IWorkbenchWindow; +import org.eclipse.ui.plugin.AbstractUIPlugin; import org.osgi.framework.BundleContext; /** * The main plugin class to be used in the desktop. */ -public class PHPDebugCorePlugin extends Plugin { - public static final String PLUGIN_ID = "net.sourceforge.phpeclipse.debug.core"; //$NON-NLS-1$ +public class PHPDebugCorePlugin extends AbstractUIPlugin { // The shared instance. protected static PHPDebugCorePlugin plugin; + public static final String PLUGIN_ID = "net.sourceforge.phpeclipse.debug.core"; //$NON-NLS-1$ + + public static IWorkbenchPage getActivePage() { + return getDefault().internalGetActivePage(); + } + public static Shell getActiveWorkbenchShell() { + return getActiveWorkbenchWindow().getShell(); + } + public static IWorkbenchWindow getActiveWorkbenchWindow() { + return getDefault().getWorkbench().getActiveWorkbenchWindow(); + } /** - * The constructor. + * Returns the shared instance. */ - public PHPDebugCorePlugin() { - super(); - plugin = this; - } + public static PHPDebugCorePlugin getDefault() { + return plugin; + } + + public static String getFormattedMessage(String key, String arg) { + String text = getResourceString(key); + return java.text.MessageFormat.format(text, new Object[] { arg }); + } + public static String getResourceString(String key) { + ResourceBundle bundle = plugin.getResourceBundle(); + if (bundle != null) { + try { + String bundleString = bundle.getString(key); + //return "$"+bundleString; + return bundleString; + } catch (MissingResourceException e) { + // default actions is to return key, which is OK + } + } + return key; + } /** - * Returns the shared instance. + * Convenience method which returns the unique identifier of this plugin. */ - public static PHPDebugCorePlugin getDefault() { - return plugin; + public static String getUniqueIdentifier() { + return PLUGIN_ID; } /** @@ -50,12 +86,28 @@ public class PHPDebugCorePlugin extends Plugin { public static void log(Throwable e) { log(new Status(IStatus.ERROR, PLUGIN_ID, IStatus.ERROR, "PHPLaunchingPlugin.internalErrorOccurred", e)); //$NON-NLS-1$ } - + private ResourceBundle resourceBundle; /** - * Convenience method which returns the unique identifier of this plugin. + * The constructor. */ - public static String getUniqueIdentifier() { - return PLUGIN_ID; + public PHPDebugCorePlugin() { + super(); + plugin = this; + try { + resourceBundle = + ResourceBundle.getBundle( + "net.sourceforge.phpdt.internal.debug.core.debugresources"); //$NON-NLS-1$ + } catch (MissingResourceException x) { + resourceBundle = null; + } + } + + public java.util.ResourceBundle getResourceBundle() { + return resourceBundle; + } + + private IWorkbenchPage internalGetActivePage() { + return getWorkbench().getActiveWorkbenchWindow().getActivePage(); } /** diff --git a/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/PHPDegugCorePluginImages.java b/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/PHPDegugCorePluginImages.java new file mode 100644 index 0000000..7e48417 --- /dev/null +++ b/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/PHPDegugCorePluginImages.java @@ -0,0 +1,166 @@ +/******************************************************************************* + * Copyright (c) 2000, 2004 IBM Corporation and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Common Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/cpl-v10.html + * + * Contributors: + * IBM Corporation - initial API and implementation + *******************************************************************************/ +package net.sourceforge.phpdt.internal.debug.core; + +import java.net.*; + +import org.eclipse.jface.resource.*; +import org.eclipse.swt.graphics.Image; + +public class PHPDegugCorePluginImages { + + private final static URL BASE_URL = + PHPDebugCorePlugin.getDefault().getDescriptor().getInstallURL(); + private final static ImageRegistry PLUGIN_REGISTRY = + PHPDebugCorePlugin.getDefault().getImageRegistry(); + + public final static String ICONS_PATH = "icons/"; //$NON-NLS-1$ + + private static final String PATH_OBJ = ICONS_PATH + "obj16/"; //$NON-NLS-1$ + private static final String PATH_LCL = ICONS_PATH + "elcl16/"; //$NON-NLS-1$ + private static final String PATH_LCL_DISABLED = ICONS_PATH + "dlcl16/"; //$NON-NLS-1$ + private static final String PATH_OVR = ICONS_PATH + "ovr16/"; //$NON-NLS-1$ + private static final String PATH_EVENTS = ICONS_PATH + "eview16/"; //$NON-NLS-1$ + + + public static final ImageDescriptor DESC_ERROR_ST_OBJ = + create(PATH_OBJ, "error_st_obj.gif"); //$NON-NLS-1$ + public static final ImageDescriptor DESC_ERROR_STACK_OBJ = + create(PATH_OBJ, "error_stack.gif"); //$NON-NLS-1$ + public static final ImageDescriptor DESC_EXT_POINT_OBJ = + create(PATH_OBJ, "ext_point_obj.gif"); //$NON-NLS-1$ + public static final ImageDescriptor DESC_EXT_POINTS_OBJ = + create(PATH_OBJ, "ext_points_obj.gif"); //$NON-NLS-1$ + public static final ImageDescriptor DESC_EXTENSION_OBJ = + create(PATH_OBJ, "extension_obj.gif"); //$NON-NLS-1$ + public static final ImageDescriptor DESC_EXTENSIONS_OBJ = + create(PATH_OBJ, "extensions_obj.gif"); //$NON-NLS-1$ + public static final ImageDescriptor DESC_GENERIC_XML_OBJ = + create(PATH_OBJ, "generic_xml_obj.gif"); //$NON-NLS-1$ + public static final ImageDescriptor DESC_INFO_ST_OBJ = + create(PATH_OBJ, "info_st_obj.gif"); //$NON-NLS-1$ + public static final ImageDescriptor DESC_JAVA_LIB_OBJ = + create(PATH_OBJ, "java_lib_obj.gif"); //$NON-NLS-1$ + public static final ImageDescriptor DESC_NATIVE_LIB_OBJ = + create(PATH_OBJ, "native_lib_obj.gif"); //$NON-NLS-1$ + public static final ImageDescriptor DESC_OK_ST_OBJ = + create(PATH_OBJ, "ok_st_obj.gif"); //$NON-NLS-1$ + public static final ImageDescriptor DESC_PLUGIN_OBJ = + create(PATH_OBJ, "plugin_obj.gif"); //$NON-NLS-1$ + public static final ImageDescriptor DESC_REQ_PLUGIN_OBJ = + create(PATH_OBJ, "req_plugin_obj.gif"); //$NON-NLS-1$ + public static final ImageDescriptor DESC_REQ_PLUGINS_OBJ = + create(PATH_OBJ, "req_plugins_obj.gif"); //$NON-NLS-1$ + public static final ImageDescriptor DESC_RUNTIME_OBJ = + create(PATH_OBJ, "runtime_obj.gif"); //$NON-NLS-1$ + public static final ImageDescriptor DESC_WARNING_ST_OBJ = + create(PATH_OBJ, "warning_st_obj.gif"); //$NON-NLS-1$ + + /* + * Local tool bar image descriptors + */ + + public static final ImageDescriptor DESC_PROPERTIES = + create(PATH_LCL, "properties.gif"); //$NON-NLS-1$ + public static final ImageDescriptor DESC_OPEN_LOG = + create(PATH_LCL, "open_log.gif"); //$NON-NLS-1$ + public static final ImageDescriptor DESC_OPEN_LOG_DISABLED = + create(PATH_LCL_DISABLED, "open_log.gif"); //$NON-NLS-1$ + + public static final ImageDescriptor DESC_PROPERTIES_DISABLED = + create(PATH_LCL_DISABLED, "properties.gif"); //$NON-NLS-1$ + public static final ImageDescriptor DESC_REFRESH = + create(PATH_LCL, "refresh.gif"); //$NON-NLS-1$ + public static final ImageDescriptor DESC_REFRESH_DISABLED = + create(PATH_LCL_DISABLED, "refresh.gif"); //$NON-NLS-1$ + public static final ImageDescriptor DESC_CLEAR = create(PATH_LCL, "clear.gif"); //$NON-NLS-1$ + public static final ImageDescriptor DESC_CLEAR_DISABLED = + create(PATH_LCL_DISABLED, "clear.gif"); //$NON-NLS-1$ + + public static final ImageDescriptor DESC_READ_LOG = + create(PATH_LCL, "restore_log.gif"); //$NON-NLS-1$ + public static final ImageDescriptor DESC_READ_LOG_DISABLED = + create(PATH_LCL_DISABLED, "restore_log.gif"); //$NON-NLS-1$ + + public static final ImageDescriptor DESC_REMOVE_LOG = + create(PATH_LCL, "remove.gif"); //$NON-NLS-1$ + public static final ImageDescriptor DESC_REMOVE_LOG_DISABLED = + create(PATH_LCL_DISABLED, "remove.gif"); //$NON-NLS-1$ + + public static final ImageDescriptor DESC_FILTER = + create(PATH_LCL, "filter_ps.gif"); //$NON-NLS-1$ + public static final ImageDescriptor DESC_FILTER_DISABLED = + create(PATH_LCL_DISABLED, "filter_ps.gif"); //$NON-NLS-1$ + + public static final ImageDescriptor DESC_EXPORT = + create(PATH_LCL, "export_log.gif"); //$NON-NLS-1$ + public static final ImageDescriptor DESC_EXPORT_DISABLED = + create(PATH_LCL_DISABLED, "export_log.gif"); //$NON-NLS-1$ + + public static final ImageDescriptor DESC_IMPORT = + create(PATH_LCL, "import_log.gif"); //$NON-NLS-1$ + public static final ImageDescriptor DESC_IMPORT_DISABLED = + create(PATH_LCL_DISABLED, "import_log.gif"); //$NON-NLS-1$ + + public static final ImageDescriptor DESC_COLLAPSE_ALL = + create(PATH_LCL, "collapseall.gif"); //$NON-NLS-1$ + + public static final ImageDescriptor DESC_HORIZONTAL_VIEW = + create(PATH_LCL, "th_horizontal.gif"); //$NON-NLS-1$ + + public static final ImageDescriptor DESC_HORIZONTAL_VIEW_DISABLED = + create(PATH_LCL_DISABLED, "th_horizontal.gif"); //$NON-NLS-1$ + + public static final ImageDescriptor DESC_VERTICAL_VIEW = + create(PATH_LCL, "th_vertical.gif"); //$NON-NLS-1$ + + public static final ImageDescriptor DESC_VERTICAL_VIEW_DISABLED = + create(PATH_LCL_DISABLED, "th_vertical.gif"); //$NON-NLS-1$ + + public static final ImageDescriptor DESC_HIDE_PANE = + create(PATH_EVENTS, "hide_pane.gif"); //$NON-NLS-1$ + + /* + * Event Details + */ + public static final ImageDescriptor DESC_PREV_EVENT = + create(PATH_EVENTS, "event_prev.gif"); //$NON-NLS-1$ + public static final ImageDescriptor DESC_NEXT_EVENT = + create(PATH_EVENTS, "event_next.gif"); //$NON-NLS-1$ + /* + * Overlays + */ + public static final ImageDescriptor DESC_RUN_CO = + create(PATH_OVR, "run_co.gif"); //$NON-NLS-1$ + + private static ImageDescriptor create(String prefix, String name) { + return ImageDescriptor.createFromURL(makeIconURL(prefix, name)); + } + + public static Image get(String key) { + return PLUGIN_REGISTRY.get(key); + } + private static URL makeIconURL(String prefix, String name) { + String path = prefix + name; + URL url = null; + try { + url = new URL(BASE_URL, path); + } catch (MalformedURLException e) { + return null; + } + return url; + } + public static Image manage(String key, ImageDescriptor desc) { + Image image = desc.createImage(); + PLUGIN_REGISTRY.put(key, image); + return image; + } +} diff --git a/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/debugresources.properties b/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/debugresources.properties new file mode 100644 index 0000000..702aa2a --- /dev/null +++ b/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/debugresources.properties @@ -0,0 +1,118 @@ +############################################################################### +# Copyright (c) 2000, 2004 IBM Corporation and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Common Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/cpl-v10.html +# +# Contributors: +# IBM Corporation - initial API and implementation +############################################################################### +# +# PDE Runtime resources +# + +LogView.column.severity = ! +LogView.column.message = Message +LogView.column.plugin = Plug-in +LogView.column.date = Date +LogView.clear = C&lear log viewer +LogView.clear.tooltip = Clear log viewer +LogView.copy = &Copy +LogView.delete = &Delete log +LogView.delete.tooltip = Delete log +LogView.export = &Export log... +LogView.export.tooltip = Export log +LogView.import = &Import log... +LogView.import.tooltip = Import log +LogView.filter = &Filters... +LogView.readLog.reload = Re&load this workspace's log +LogView.readLog.restore = &Restore log +LogView.readLog.restore.tooltip = Restore log +LogView.severity.error = Error +LogView.severity.warning = Warning +LogView.severity.info = Info +LogView.confirmDelete.title = Confirm Delete +LogView.confirmDelete.message = Are you sure you want to permanently delete all logged events? +LogView.confirmOverwrite.message = File " {0}" exists. Would you like to overwrite it? +LogView.operation.importing = Importing log... +LogView.operation.reloading = Reloading... +LogView.activate = &Activate on new events +LogView.view.currentLog = &Open log +LogView.view.currentLog.tooltip = Open log + +LogView.FilterDialog.title = Log Filters +LogView.FilterDialog.eventTypes = Event Types +LogView.FilterDialog.information = &Information +LogView.FilterDialog.warning = &Warning +LogView.FilterDialog.error = &Error +LogView.FilterDialog.limitTo = &Limit visible events to: +LogView.FilterDialog.eventsLogged = Show events logged during: +LogView.FilterDialog.allSessions = &All sessions +LogView.FilterDialog.recentSession = &Most recent session + +RegistryView.extensionPointPR.id = Id +RegistryView.extensionPointPR.name = Name + +RegistryView.extensionPR.id = Id +RegistryView.extensionPR.name = Name +RegistryView.extensionPR.point = Point + +RegistryView.libraryPR.path = Path +RegistryView.libraryPR.exported = Exported +RegistryView.libraryPR.fullyExported = Fully Exported + +RegistryView.pluginPR.installURL = Install URL +RegistryView.pluginPR.name = Name +RegistryView.pluginPR.id = Unique ID +RegistryView.pluginPR.providerName = Provider Name +RegistryView.pluginPR.version = Version +RegistryView.pluginPR.activated = Activated + +RegistryView.prerequisitePR.exported = Exported +RegistryView.prerequisitePR.id = Unique Id +RegistryView.prerequisitePR.version = Required Version +RegistryView.prerequisitePR.optional = Optional +RegistryView.prerequisitePR.match = Match Rule +RegistryView.prerequisitePR.matchedCompatible = Compatible +RegistryView.prerequisitePR.matchedExact = Exact +RegistryView.prerequisitePR.matchedEquivalent = Equivalent +RegistryView.prerequisitePR.matchedGreaterOrEqual = Greater or Equal +RegistryView.prerequisitePR.matchedPerfect = Perfect + +RegistryView.refresh.label=&Refresh +RegistryView.refresh.tooltip=Refresh +RegistryView.collapseAll.label = &Collapse All +RegistryView.collapseAll.tooltip = Collapse All + +RegistryView.folders.imports = Prerequisites +RegistryView.folders.libraries = Run-time Libraries +RegistryView.folders.extensionPoints = Extension Points +RegistryView.folders.extensions = Extensions +EventDetailsDialog.title= Event Details +EventDetailsDialog.date=Date: +EventDetailsDialog.severity=Severity: +EventDetailsDialog.message=Message: +EventDetailsDialog.exception=Exception Stack Trace: +EventDetailsDialog.session=Session Data: +EventDetailsDialog.noStack = An exception stack trace could not be found. +EventDetailsDialog.previous=View details of previous event +EventDetailsDialog.next=View details of next event +EventDetailsDialog.copy=Copy event details to clipboard + +RegistryView.showRunning.label = &Show Active Plug-ins Only + +RegistryView.showPropertiesSheet.label = S&how Registry Only +RegistryView.showPropertiesSheet.tooltip = Show Plug-in Registry Only +RegistryView.showPropertiesSheet.desc = Hide registry properties + +RegistryView.verticalOrientation.label = &Vertical View Orientation +RegistryView.verticalOrientation.tooltip = Vertical View Orientation +RegistryView.verticalOrientation.desc = Tile vertically + +RegistryView.horizontalOrientation.label = &Horizontal View Orientation +RegistryView.horizontalOrientation.tooltip = Horizontal View Orientation +RegistryView.horizontalOrientation.desc = Tile horizontally +OpenLogDialog.title=Error Log +OpenLogDialog.message=Opening log... +OpenLogDialog.cannotDisplay=Log file cannot be displayed. diff --git a/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/logview/EventDetailsDialog.java b/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/logview/EventDetailsDialog.java new file mode 100644 index 0000000..8736c10 --- /dev/null +++ b/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/logview/EventDetailsDialog.java @@ -0,0 +1,629 @@ +/******************************************************************************* + * Copyright (c) 2000, 2004 IBM Corporation and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Common Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/cpl-v10.html + * + * Contributors: + * IBM Corporation - initial API and implementation + *******************************************************************************/ +package net.sourceforge.phpdt.internal.debug.core.logview; + +import java.io.IOException; +import java.io.PrintWriter; +import java.io.StringWriter; +import java.text.Collator; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Arrays; +import java.util.Comparator; +import java.util.Date; + +import net.sourceforge.phpdt.internal.debug.core.PHPDegugCorePluginImages; +import net.sourceforge.phpdt.internal.debug.core.PHPDebugCorePlugin; + +import org.eclipse.core.runtime.IAdaptable; +import org.eclipse.jface.dialogs.Dialog; +import org.eclipse.jface.dialogs.IDialogConstants; +import org.eclipse.jface.dialogs.IDialogSettings; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jface.viewers.ISelectionProvider; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.jface.viewers.StructuredSelection; +import org.eclipse.jface.viewers.TableTreeViewer; +import org.eclipse.swt.SWT; +import org.eclipse.swt.custom.SashForm; +import org.eclipse.swt.dnd.Clipboard; +import org.eclipse.swt.dnd.TextTransfer; +import org.eclipse.swt.dnd.Transfer; +import org.eclipse.swt.graphics.Image; +import org.eclipse.swt.graphics.Point; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.swt.widgets.Text; +import org.eclipse.ui.ISharedImages; +import org.eclipse.ui.PlatformUI; + +public class EventDetailsDialog extends Dialog { + private LogEntry entry, parentEntry; + private LogViewLabelProvider labelProvider; + private static int COPY_ID = 22; + private TableTreeViewer provider; + private int elementNum, totalElementCount; + private LogEntry[] entryChildren; + private int childIndex = 0; + private boolean isOpen; + + private Label dateLabel; + private Label severityImageLabel; + private Label severityLabel; + private Text msgText; + private Text stackTraceText; + private Text sessionDataText; + private Clipboard clipboard; + private Button copyButton; + private Button backButton; + private Button nextButton; + private Image imgNextEnabled; + private Image imgPrevEnabled; + private Image imgCopyEnabled; + private SashForm sashForm; + + // sorting + private static int ASCENDING = 1; + private Comparator comparator = null; + private Collator collator; + + // location configuration + private IDialogSettings dialogSettings; + private Point dialogLocation; + private Point dialogSize; + private int[] sashWeights; + + // externalize strings + private String EVENT_NO_STACK = "EventDetailsDialog.noStack"; //$NON-NLS-1$ + private String EVENT_PREVIOUS = "EventDetailsDialog.previous"; //$NON-NLS-1$ + private String EVENT_NEXT = "EventDetailsDialog.next"; //$NON-NLS-1$ + private String EVENT_COPY = "EventDetailsDialog.copy"; //$NON-NLS-1$ + + /** + * @param parentShell + * shell in which dialog is displayed + */ + protected EventDetailsDialog(Shell parentShell, IAdaptable selection, ISelectionProvider provider) { + super(parentShell); + labelProvider = new LogViewLabelProvider(); + this.provider = (TableTreeViewer) provider; + this.entry = (LogEntry)selection; + setShellStyle(SWT.MODELESS | SWT.MIN | SWT.MAX | SWT.RESIZE | SWT.CLOSE | SWT.BORDER | SWT.TITLE); + clipboard = new Clipboard(parentShell.getDisplay()); + initialize(); + createImages(); + collator = Collator.getInstance(); + readConfiguration(); + } + + private void initialize() { + elementNum = getParentElementNum(); + totalElementCount = provider.getTableTree().getTable().getItemCount() - getVisibleChildrenCount(); + parentEntry = (LogEntry) entry.getParent(entry); + if (isChild(entry)){ + setEntryChildren(parentEntry); + resetChildIndex(); + } + } + + private void resetChildIndex(){ + for (int i = 0; i 0) + width -= 100; + else + width = width/2; + sashWeights = new int[]{width, getSashForm().getClientArea().width-width}; + } + getSashForm().setWeights(sashWeights); + return super.open(); + } + + public boolean close() { + storeSettings(); + isOpen = false; + imgCopyEnabled.dispose(); + imgNextEnabled.dispose(); + imgPrevEnabled.dispose(); + return super.close(); + } + + public void create() { + super.create(); + + // dialog location + if (dialogLocation != null) + getShell().setLocation(dialogLocation); + + // dialog size + if (dialogSize != null) + getShell().setSize(dialogSize); + else + getShell().setSize(500,550); + + + applyDialogFont(buttonBar); + getButton(IDialogConstants.OK_ID).setFocus(); + } + + protected void buttonPressed(int buttonId) { + if (IDialogConstants.OK_ID == buttonId) + okPressed(); + else if (IDialogConstants.CANCEL_ID == buttonId) + cancelPressed(); + else if (IDialogConstants.BACK_ID == buttonId) + backPressed(); + else if (IDialogConstants.NEXT_ID == buttonId) + nextPressed(); + else if (COPY_ID == buttonId) + copyPressed(); + } + + protected void backPressed() { + if (isChild(entry)) { + if (childIndex > 0) { + childIndex--; + entry = entryChildren[childIndex]; + } else + entry = parentEntry; + } else { + if (elementNum - 1 >= 0) + elementNum -= 1; + entry = (LogEntry) provider.getElementAt(elementNum); + } + setEntrySelectionInTable(); + } + + protected void nextPressed() { + if (isChild(entry) && childIndex < entryChildren.length-1) { + childIndex++; + entry = entryChildren[childIndex]; + } else if (elementNum + 1 < totalElementCount){ + elementNum += 1; + entry = (LogEntry) provider.getElementAt(elementNum); + } else { // at end of list but can branch into child elements - bug 58083 + setEntryChildren(entry); + entry = entryChildren[0]; + } + setEntrySelectionInTable(); + } + + protected void copyPressed() { + StringWriter writer = new StringWriter(); + PrintWriter pwriter = new PrintWriter(writer); + + entry.write(pwriter); + pwriter.flush(); + String textVersion = writer.toString(); + try { + pwriter.close(); + writer.close(); + } catch (IOException e) { + } + // set the clipboard contents + clipboard.setContents(new Object[] { textVersion }, new Transfer[] { TextTransfer.getInstance()}); + } + + public void setComparator(Comparator comparator){ + this.comparator = comparator; + updateProperties(); + } + private void setComparator(byte sortType, final int sortOrder){ + if (sortType == LogView.DATE){ + comparator = new Comparator(){ + public int compare(Object e1, Object e2) { + try { + SimpleDateFormat formatter = new SimpleDateFormat("MMM dd, yyyy HH:mm:ss.SS"); //$NON-NLS-1$ + Date date1 = formatter.parse(((LogEntry)e1).getDate()); + Date date2 = formatter.parse(((LogEntry)e2).getDate()); + if (sortOrder == ASCENDING) + return date1.before(date2) ? -1 : 1; + return date1.after(date2) ? -1 : 1; + } catch (ParseException e) { + } + return 0; + } + }; + } else if (sortType == LogView.PLUGIN){ + comparator = new Comparator(){ + public int compare(Object e1, Object e2) { + LogEntry entry1 = (LogEntry)e1; + LogEntry entry2 = (LogEntry)e2; + return collator.compare(entry1.getPluginId(), entry2.getPluginId()) * sortOrder; + } + }; + } else { + comparator = new Comparator(){ + public int compare(Object e1, Object e2) { + LogEntry entry1 = (LogEntry)e1; + LogEntry entry2 = (LogEntry)e2; + return collator.compare(entry1.getMessage(), entry2.getMessage()) * sortOrder; + } + }; + } + } + + public void resetSelection(IAdaptable selectedEntry, byte sortType, int sortOrder){ + setComparator(sortType, sortOrder); + resetSelection(selectedEntry); + } + + public void resetSelection(IAdaptable selectedEntry){ + if (entry.equals(selectedEntry) && + elementNum == getParentElementNum()){ + updateProperties(); + return; + } + entry = (LogEntry)selectedEntry; + initialize(); + updateProperties(); + } + + public void resetButtons(){ + backButton.setEnabled(false); + nextButton.setEnabled(false); + } + + private void setEntrySelectionInTable(){ + ISelection selection = new StructuredSelection(entry); + provider.setSelection(selection); + } + + public void updateProperties() { + if (isChild(entry)){ + parentEntry = (LogEntry) entry.getParent(entry); + setEntryChildren(parentEntry); + resetChildIndex(); + } + + + totalElementCount = provider.getTableTree().getTable().getItemCount() - getVisibleChildrenCount(); + dateLabel.setText(entry.getDate()); + severityImageLabel.setImage(labelProvider.getColumnImage(entry, 1)); + severityLabel.setText(entry.getSeverityText()); + msgText.setText(entry.getMessage()); + String stack = entry.getStack(); + if (stack != null) { + stackTraceText.setText(stack); + } else { + stackTraceText.setText(PHPDebugCorePlugin.getResourceString(EVENT_NO_STACK)); + } + LogSession session = entry.getSession(); + if (session != null && session.getSessionData() != null) + sessionDataText.setText(session.getSessionData()); + + updateButtons(); + } + + private void updateButtons(){ + boolean isAtEnd = elementNum == totalElementCount - 1; + if (isChild(entry)){ + backButton.setEnabled(true); + boolean isLastChild = childIndex == entryChildren.length-1; + nextButton.setEnabled(!isLastChild || !isAtEnd || entry.hasChildren()); + } else { + backButton.setEnabled(elementNum != 0); + nextButton.setEnabled(!isAtEnd || entry.hasChildren()); + } + } + + private void setEntryChildren(LogEntry parent){ + Object[] children = parent.getChildren(parent); + if (comparator != null) + Arrays.sort(children, comparator); + entryChildren = new LogEntry[children.length]; + + System.arraycopy(children,0,entryChildren,0,children.length); + } + + private int getParentElementNum(){ + LogEntry itemEntry = (LogEntry)((IStructuredSelection)provider.getSelection()).getFirstElement(); + itemEntry = getRootEntry(itemEntry); + + for (int i = 0; i 0; + } + public String toString() { + return getSeverityText(); + } + /** + * @see IWorkbenchAdapter#getChildren(Object) + */ + public Object[] getChildren(Object parent) { + if (children == null) + return new Object[0]; + return children.toArray(); + } + + /** + * @see IWorkbenchAdapter#getImageDescriptor(Object) + */ + public ImageDescriptor getImageDescriptor(Object arg0) { + return null; + } + + /** + * @see IWorkbenchAdapter#getLabel(Object) + */ + public String getLabel(Object obj) { + return getSeverityText(); + } + + /** + * @see IWorkbenchAdapter#getParent(Object) + */ + public Object getParent(Object obj) { + return parent; + } + + void setParent(LogEntry parent) { + this.parent = parent; + } + + private String getSeverityText(int severity) { + switch (severity) { + case IStatus.ERROR : + return PHPDebugCorePlugin.getResourceString(KEY_ERROR); + case IStatus.WARNING : + return PHPDebugCorePlugin.getResourceString(KEY_WARNING); + case IStatus.INFO : + return PHPDebugCorePlugin.getResourceString(KEY_INFO); + } + return "?"; //$NON-NLS-1$ + } + + int processLogLine(String line, boolean root) { + //!ENTRY + //!SUBENTRY + StringTokenizer stok = new StringTokenizer(line, " ", true); //$NON-NLS-1$ + StringBuffer dateBuffer = new StringBuffer(); + + int dateCount = 5; + int depth = 0; + for (int i = 0; stok.hasMoreTokens();) { + String token = stok.nextToken(); + if (i >= dateCount) { + dateBuffer.append(token); + continue; + } else if (token.equals(" ")) //$NON-NLS-1$ + continue; + switch (i) { + case 0 : // entry or subentry + if (root) + i += 2; + else + i++; + break; + case 1 : // depth + depth = parseInteger(token); + i++; + break; + case 2 : + pluginId = token; + i++; + break; + case 3 : // severity + severity = parseInteger(token); + i++; + break; + case 4 : // code + code = parseInteger(token); + i++; + break; + } + } + date = dateBuffer.toString().trim(); + return depth; + } + + private int parseInteger(String token) { + try { + return Integer.parseInt(token); + } catch (NumberFormatException e) { + return 0; + } + } + + void setStack(String stack) { + this.stack = stack; + } + void setMessage(String message) { + this.message = message; + } + + private void processStatus(IStatus status) { + pluginId = status.getPlugin(); + severity = status.getSeverity(); + code = status.getCode(); + DateFormat formatter = new SimpleDateFormat("MMM dd, yyyy HH:mm:ss.SS"); //$NON-NLS-1$ + date = formatter.format(new Date()); + message = status.getMessage(); + Throwable throwable = status.getException(); + if (throwable != null) { + StringWriter swriter = new StringWriter(); + PrintWriter pwriter = new PrintWriter(swriter); + throwable.printStackTrace(pwriter); + pwriter.flush(); + pwriter.close(); + stack = swriter.toString(); + } + IStatus[] schildren = status.getChildren(); + if (schildren.length > 0) { + children = new ArrayList(); + for (int i = 0; i < schildren.length; i++) { + LogEntry child = new LogEntry(schildren[i]); + addChild(child); + } + } + } + void addChild(LogEntry child) { + if (children == null) + children = new ArrayList(); + children.add(child); + child.setParent(this); + } + public void write(PrintWriter writer) { + writer.print(getSeverityText()); + if (date != null) { + writer.print(" "); //$NON-NLS-1$ + writer.print(getDate()); + } + if (message != null) { + writer.print(" "); //$NON-NLS-1$ + writer.print(getMessage()); + } + writer.println(); + if (stack != null) + writer.println(stack); + } +} diff --git a/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/logview/LogReader.java b/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/logview/LogReader.java new file mode 100644 index 0000000..b5f5405 --- /dev/null +++ b/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/logview/LogReader.java @@ -0,0 +1,308 @@ +/******************************************************************************* + * Copyright (c) 2000, 2004 IBM Corporation and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Common Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/cpl-v10.html + * + * Contributors: + * IBM Corporation - initial API and implementation + *******************************************************************************/ +package net.sourceforge.phpdt.internal.debug.core.logview; + +import java.io.BufferedReader; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.PrintWriter; +import java.io.RandomAccessFile; +import java.io.StringWriter; +import java.util.ArrayList; +import java.util.Date; + +import org.eclipse.core.runtime.IStatus; +import org.eclipse.ui.IMemento; + +class LogReader { + private static final int SESSION_STATE = 10; + public static final long MAX_FILE_LENGTH = 1024*1024; + private static final int ENTRY_STATE = 20; + private static final int SUBENTRY_STATE = 30; + private static final int MESSAGE_STATE = 40; + private static final int STACK_STATE = 50; + private static final int TEXT_STATE = 60; + private static final int UNKNOWN_STATE = 70; + + private static LogSession currentSession; + + public static void parseLargeFile(File file, ArrayList entries, IMemento memento) { + ArrayList parents = new ArrayList(); + LogEntry current = null; + LogSession session = null; + int writerState = UNKNOWN_STATE; + StringWriter swriter = null; + PrintWriter writer = null; + int state = UNKNOWN_STATE; + currentSession = null; + RandomAccessFile random = null; + try { + random = new RandomAccessFile(file, "r"); //$NON-NLS-1$ + random.seek(file.length() - MAX_FILE_LENGTH); + for (;;) { + String line = random.readLine(); + if (line == null) + break; + + line = line.trim(); + if (line.length() == 0) + continue; + + if (line.startsWith("!SESSION")) { //$NON-NLS-1$ + state = SESSION_STATE; + } else if (line.startsWith("!ENTRY")) { //$NON-NLS-1$ + state = ENTRY_STATE; + } else if (line.startsWith("!SUBENTRY")) { //$NON-NLS-1$ + state = SUBENTRY_STATE; + } else if (line.startsWith("!MESSAGE")) { //$NON-NLS-1$ + state = MESSAGE_STATE; + } else if (line.startsWith("!STACK")) { //$NON-NLS-1$ + state = STACK_STATE; + } else + state = TEXT_STATE; + + if (state == TEXT_STATE) { + if (writer != null) + writer.println(line); + continue; + } + + if (writer != null) { + if (writerState == STACK_STATE && current != null) { + current.setStack(swriter.toString()); + } else if (writerState == SESSION_STATE && session != null) { + session.setSessionData(swriter.toString()); + } else if (writerState == MESSAGE_STATE && current != null){ + String message = current.getMessage() + swriter.toString(); + message = message.trim(); + current.setMessage(message); + } + writerState = UNKNOWN_STATE; + swriter = null; + writer.close(); + writer = null; + } + + if (state == STACK_STATE) { + swriter = new StringWriter(); + writer = new PrintWriter(swriter, true); + writerState = STACK_STATE; + } else if (state == SESSION_STATE) { + session = new LogSession(); + session.processLogLine(line); + swriter = new StringWriter(); + writer = new PrintWriter(swriter, true); + writerState = SESSION_STATE; + updateCurrentSession(session); + if (currentSession.equals(session) && !memento.getString(LogView.P_SHOW_ALL_SESSIONS).equals("true")) //$NON-NLS-1$ + entries.clear(); + } else if (state == ENTRY_STATE) { + LogEntry entry = new LogEntry(); + entry.setSession(session); + entry.processLogLine(line, true); + setNewParent(parents, entry, 0); + current = entry; + addEntry(current, entries, memento, false); + } else if (state == SUBENTRY_STATE) { + LogEntry entry = new LogEntry(); + entry.setSession(session); + int depth = entry.processLogLine(line, false); + setNewParent(parents, entry, depth); + current = entry; + LogEntry parent = (LogEntry) parents.get(depth - 1); + parent.addChild(entry); + } else if (state == MESSAGE_STATE) { + swriter = new StringWriter(); + writer = new PrintWriter(swriter, true); + String message = ""; //$NON-NLS-1$ + if (line.length() > 8) + message = line.substring(9).trim(); + message = message.trim(); + if (current != null) + current.setMessage(message); + writerState = MESSAGE_STATE; + } + } + } catch (FileNotFoundException e) { + } catch (IOException e) { + } finally { + try { + if (random != null) + random.close(); + } catch (IOException e1) { + } + } + } + + public static void parseLogFile(File file, ArrayList entries, IMemento memento) { + ArrayList parents = new ArrayList(); + LogEntry current = null; + LogSession session = null; + int writerState = UNKNOWN_STATE; + StringWriter swriter = null; + PrintWriter writer = null; + int state = UNKNOWN_STATE; + currentSession = null; + BufferedReader reader = null; + try { + + reader = new BufferedReader(new InputStreamReader(new FileInputStream(file), "UTF-8")); //$NON-NLS-1$ + while(reader.ready()) { + String line = reader.readLine(); + if (line == null) + continue; + line = line.trim(); + if (line.length() == 0) + continue; + + if (line.startsWith("!SESSION")) { //$NON-NLS-1$ + state = SESSION_STATE; + } else if (line.startsWith("!ENTRY")) { //$NON-NLS-1$ + state = ENTRY_STATE; + } else if (line.startsWith("!SUBENTRY")) { //$NON-NLS-1$ + state = SUBENTRY_STATE; + } else if (line.startsWith("!MESSAGE")) { //$NON-NLS-1$ + state = MESSAGE_STATE; + } else if (line.startsWith("!STACK")) { //$NON-NLS-1$ + state = STACK_STATE; + } else + state = TEXT_STATE; + + if (state == TEXT_STATE) { + if (writer != null) + writer.println(line); + continue; + } + + if (writer != null) { + if (writerState == STACK_STATE && current != null) { + current.setStack(swriter.toString()); + } else if (writerState == SESSION_STATE && session != null) { + session.setSessionData(swriter.toString()); + } else if (writerState == MESSAGE_STATE && current != null){ + String message = current.getMessage() + swriter.toString(); + message = message.trim(); + current.setMessage(message); + } + writerState = UNKNOWN_STATE; + swriter = null; + writer.close(); + writer = null; + } + + if (state == STACK_STATE) { + swriter = new StringWriter(); + writer = new PrintWriter(swriter, true); + writerState = STACK_STATE; + } else if (state == SESSION_STATE) { + session = new LogSession(); + session.processLogLine(line); + swriter = new StringWriter(); + writer = new PrintWriter(swriter, true); + writerState = SESSION_STATE; + updateCurrentSession(session); + if (currentSession.equals(session) && !memento.getString(LogView.P_SHOW_ALL_SESSIONS).equals("true")) //$NON-NLS-1$ + entries.clear(); + } else if (state == ENTRY_STATE) { + LogEntry entry = new LogEntry(); + entry.setSession(session); + entry.processLogLine(line, true); + setNewParent(parents, entry, 0); + current = entry; + addEntry(current, entries, memento, false); + } else if (state == SUBENTRY_STATE) { + LogEntry entry = new LogEntry(); + entry.setSession(session); + int depth = entry.processLogLine(line, false); + setNewParent(parents, entry, depth); + current = entry; + LogEntry parent = (LogEntry) parents.get(depth - 1); + parent.addChild(entry); + } else if (state == MESSAGE_STATE) { + swriter = new StringWriter(); + writer = new PrintWriter(swriter, true); + String message = ""; //$NON-NLS-1$ + if (line.length() > 8) + message = line.substring(9).trim(); + message = message.trim(); + if (current != null) + current.setMessage(message); + writerState = MESSAGE_STATE; + } + } + } catch (FileNotFoundException e) { + } catch (IOException e) { + } finally { + try { + if (reader != null) + reader.close(); + } catch (IOException e1) { + } + } + } + + private static void updateCurrentSession(LogSession session) { + if (currentSession == null) { + currentSession = session; + return; + } + Date currentDate = currentSession.getDate(); + Date sessionDate = session.getDate(); + if (currentDate == null && sessionDate != null) + currentSession = session; + else if (currentDate != null && sessionDate == null) + currentSession = session; + else if (currentDate != null && sessionDate != null && sessionDate.after(currentDate)) + currentSession = session; + } + + public static void addEntry(LogEntry current, ArrayList entries, IMemento memento, boolean useCurrentSession) { + int severity = current.getSeverity(); + boolean doAdd = true; + switch(severity) { + case IStatus.INFO: + doAdd = memento.getString(LogView.P_LOG_INFO).equals("true"); //$NON-NLS-1$ + break; + case IStatus.WARNING: + doAdd = memento.getString(LogView.P_LOG_WARNING).equals("true"); //$NON-NLS-1$ + break; + case IStatus.ERROR: + doAdd = memento.getString(LogView.P_LOG_ERROR).equals("true"); //$NON-NLS-1$ + break; + } + if (doAdd) { + if (useCurrentSession) + current.setSession(currentSession); + entries.add(0, current); + + if (memento.getString(LogView.P_USE_LIMIT).equals("true") //$NON-NLS-1$ + && entries.size() > memento.getInteger(LogView.P_LOG_LIMIT).intValue()) + entries.remove(entries.size() - 1); + } + } + + private static void setNewParent( + ArrayList parents, + LogEntry entry, + int depth) { + if (depth + 1 > parents.size()) + parents.add(entry); + else + parents.set(depth, entry); + } + + public static void reset() { + currentSession = null; + } +} diff --git a/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/logview/LogSession.java b/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/logview/LogSession.java new file mode 100644 index 0000000..43b2dc5 --- /dev/null +++ b/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/logview/LogSession.java @@ -0,0 +1,60 @@ +/******************************************************************************* + * Copyright (c) 2000, 2004 IBM Corporation and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Common Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/cpl-v10.html + * + * Contributors: + * IBM Corporation - initial API and implementation + *******************************************************************************/ +package net.sourceforge.phpdt.internal.debug.core.logview; + +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.StringTokenizer; + +public class LogSession { + private String sessionData; + private Date date; + + /** + * Constructor for LogSession. + */ + public LogSession() { + } + + public Date getDate() { + return date; + } + + public void setDate(String dateString) { + SimpleDateFormat formatter = new SimpleDateFormat("MMM dd, yyyy HH:mm:ss.SS"); //$NON-NLS-1$ + try { + date = formatter.parse(dateString); + } catch (ParseException e) { + } + } + + public String getSessionData() { + return sessionData; + } + + void setSessionData(String data) { + this.sessionData = data; + } + + public void processLogLine(String line) { + StringTokenizer tokenizer = new StringTokenizer(line); + if (tokenizer.countTokens() == 6) { + tokenizer.nextToken(); + StringBuffer dateBuffer = new StringBuffer(); + for (int i = 0; i < 4; i++) { + dateBuffer.append(tokenizer.nextToken()); + dateBuffer.append(" "); //$NON-NLS-1$ + } + setDate(dateBuffer.toString().trim()); + } + } +} diff --git a/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/logview/LogView.java b/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/logview/LogView.java new file mode 100644 index 0000000..c31a2f4 --- /dev/null +++ b/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/logview/LogView.java @@ -0,0 +1,992 @@ +/*********************************************************************************************************************************** + * Copyright (c) 2000, 2004 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made + * available under the terms of the Common Public License v1.0 which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/cpl-v10.html + * + * Contributors: IBM Corporation - initial API and implementation + **********************************************************************************************************************************/ + +package net.sourceforge.phpdt.internal.debug.core.logview; + +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.OutputStreamWriter; +import java.io.PrintWriter; +import java.io.StringWriter; +import java.lang.reflect.InvocationTargetException; +import java.text.Collator; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Comparator; +import java.util.Date; + +import net.sourceforge.phpdt.internal.debug.core.PHPDegugCorePluginImages; +import net.sourceforge.phpdt.internal.debug.core.PHPDebugCorePlugin; + +import org.eclipse.core.runtime.ILogListener; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Path; +import org.eclipse.core.runtime.Platform; +import org.eclipse.jface.action.Action; +import org.eclipse.jface.action.IMenuListener; +import org.eclipse.jface.action.IMenuManager; +import org.eclipse.jface.action.IStatusLineManager; +import org.eclipse.jface.action.IToolBarManager; +import org.eclipse.jface.action.MenuManager; +import org.eclipse.jface.action.Separator; +import org.eclipse.jface.dialogs.MessageDialog; +import org.eclipse.jface.dialogs.ProgressMonitorDialog; +import org.eclipse.jface.operation.IRunnableWithProgress; +import org.eclipse.jface.viewers.ColumnPixelData; +import org.eclipse.jface.viewers.DoubleClickEvent; +import org.eclipse.jface.viewers.IDoubleClickListener; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jface.viewers.ISelectionChangedListener; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.jface.viewers.ITreeViewerListener; +import org.eclipse.jface.viewers.SelectionChangedEvent; +import org.eclipse.jface.viewers.TableLayout; +import org.eclipse.jface.viewers.TableTreeViewer; +import org.eclipse.jface.viewers.TreeExpansionEvent; +import org.eclipse.jface.viewers.Viewer; +import org.eclipse.jface.viewers.ViewerSorter; +import org.eclipse.swt.SWT; +import org.eclipse.swt.custom.BusyIndicator; +import org.eclipse.swt.custom.TableTree; +import org.eclipse.swt.custom.TableTreeItem; +import org.eclipse.swt.dnd.Clipboard; +import org.eclipse.swt.dnd.TextTransfer; +import org.eclipse.swt.dnd.Transfer; +import org.eclipse.swt.events.DisposeEvent; +import org.eclipse.swt.events.DisposeListener; +import org.eclipse.swt.events.SelectionAdapter; +import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.graphics.Color; +import org.eclipse.swt.graphics.Font; +import org.eclipse.swt.graphics.FontData; +import org.eclipse.swt.graphics.Point; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.program.Program; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Display; +import org.eclipse.swt.widgets.Event; +import org.eclipse.swt.widgets.FileDialog; +import org.eclipse.swt.widgets.Listener; +import org.eclipse.swt.widgets.Menu; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.swt.widgets.Table; +import org.eclipse.swt.widgets.TableColumn; +import org.eclipse.swt.widgets.TableItem; +import org.eclipse.swt.widgets.Text; +import org.eclipse.ui.IActionBars; +import org.eclipse.ui.IMemento; +import org.eclipse.ui.ISharedImages; +import org.eclipse.ui.IViewPart; +import org.eclipse.ui.IViewSite; +import org.eclipse.ui.IWorkbenchPage; +import org.eclipse.ui.PartInitException; +import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.XMLMemento; +import org.eclipse.ui.actions.ActionFactory; +import org.eclipse.ui.part.ViewPart; + +public class LogView extends ViewPart implements ILogListener { + public final static String ID_LOGVIEW = "net.sourceforge.phpdt.internal.debug.core.logview.LogView"; + + private TableTreeViewer tableTreeViewer; + + private ArrayList logs = new ArrayList(); + + public static final String P_LOG_WARNING = "warning"; //$NON-NLS-1$ + + public static final String P_LOG_ERROR = "error"; //$NON-NLS-1$ + + public static final String P_LOG_INFO = "info"; //$NON-NLS-1$ + + public static final String P_LOG_LIMIT = "limit"; //$NON-NLS-1$ + + public static final String P_USE_LIMIT = "useLimit"; //$NON-NLS-1$ + + public static final String P_SHOW_ALL_SESSIONS = "allSessions"; //$NON-NLS-1$ + + private static final String P_COLUMN_1 = "column1"; //$NON-NLS-1$ + + private static final String P_COLUMN_2 = "column2"; //$NON-NLS-1$ + + private static final String P_COLUMN_3 = "column3"; //$NON-NLS-1$ + + private static final String P_COLUMN_4 = "column4"; //$NON-NLS-1$ + + public static final String P_ACTIVATE = "activate"; //$NON-NLS-1$ + + private int MESSAGE_ORDER = -1; + + private int PLUGIN_ORDER = -1; + + private int DATE_ORDER = -1; + + public static byte MESSAGE = 0x0; + + public static byte PLUGIN = 0x1; + + public static byte DATE = 0x2; + + private static int ASCENDING = 1; + + private static int DESCENDING = -1; + + private Action clearAction; + + private Action copyAction; + + private Action readLogAction; + + private Action deleteLogAction; + + private Action exportAction; + + private Action importAction; + + private Action activateViewAction; + + private Action propertiesAction; + + private Action viewLogAction; + + private Action filterAction; + + private Clipboard clipboard; + + private IMemento memento; + + private File inputFile; + + private String directory; + + private TableColumn column0; + + private TableColumn column1; + + private TableColumn column2; + + private TableColumn column3; + + private TableColumn column4; + + private static Font boldFont; + + private Comparator comparator; + + private Collator collator; + + // hover text + private boolean canOpenTextShell; + + private Text textLabel; + + private Shell textShell; + + private boolean firstEvent = true; + + public LogView() { + logs = new ArrayList(); + inputFile = Platform.getLogFileLocation().toFile(); + } + + public void createPartControl(Composite parent) { + readLogFile(); + TableTree tableTree = new TableTree(parent, SWT.FULL_SELECTION); + tableTree.setLayoutData(new GridData(GridData.FILL_BOTH)); + createColumns(tableTree.getTable()); + createViewer(tableTree); + createPopupMenuManager(tableTree); + makeActions(tableTree.getTable()); + fillToolBar(); + Platform.addLogListener(this); + getSite().setSelectionProvider(tableTreeViewer); + clipboard = new Clipboard(tableTree.getDisplay()); + // WorkbenchHelp.setHelp(tableTree, IHelpContextIds.LOG_VIEW); + tableTreeViewer.getTableTree().getTable().setToolTipText(""); //$NON-NLS-1$ + initializeFonts(); + applyFonts(); + } + + private void initializeFonts() { + Font tableFont = tableTreeViewer.getTableTree().getFont(); + FontData[] fontDataList = tableFont.getFontData(); + FontData fontData; + if (fontDataList.length > 0) + fontData = fontDataList[0]; + else + fontData = new FontData(); + fontData.setStyle(SWT.BOLD); + boldFont = new Font(tableTreeViewer.getTableTree().getDisplay(), fontData); + } + + /* + * Set all rows where the tableTreeItem has children to have a bold font. + */ + private void applyFonts() { + if (tableTreeViewer == null || tableTreeViewer.getTableTree().isDisposed()) + return; + int max = tableTreeViewer.getTableTree().getItemCount(); + int index = 0, tableIndex = 0; + while (index < max) { + LogEntry entry = (LogEntry) tableTreeViewer.getElementAt(index); + if (entry == null) + return; + if (entry.hasChildren()) { + tableTreeViewer.getTableTree().getItems()[index].setFont(boldFont); + tableIndex = applyChildFonts(entry, tableIndex); + } else { + tableTreeViewer.getTableTree().getItems()[index].setFont(tableTreeViewer.getTableTree().getFont()); + } + index++; + tableIndex++; + } + } + + private int applyChildFonts(LogEntry parent, int index) { + if (!tableTreeViewer.getExpandedState(parent) || !parent.hasChildren()) + return index; + LogEntry[] children = getEntryChildren(parent); + for (int i = 0; i < children.length; i++) { + index++; + if (children[i].hasChildren()) { + TableItem tableItem = getTableItem(index); + if (tableItem != null) { + tableItem.setFont(boldFont); + } + index = applyChildFonts(children[i], index); + } else { + TableItem tableItem = getTableItem(index); + if (tableItem != null) { + tableItem.setFont(tableTreeViewer.getTableTree().getFont()); + } + } + } + return index; + } + + private LogEntry[] getEntryChildren(LogEntry parent) { + Object[] entryChildren = parent.getChildren(parent); + if (comparator != null) + Arrays.sort(entryChildren, comparator); + LogEntry[] children = new LogEntry[entryChildren.length]; + System.arraycopy(entryChildren, 0, children, 0, entryChildren.length); + return children; + } + + private TableItem getTableItem(int index) { + TableItem[] tableItems = tableTreeViewer.getTableTree().getTable().getItems(); + if (index > tableItems.length - 1) + return null; + return tableItems[index]; + } + + private void fillToolBar() { + IActionBars bars = getViewSite().getActionBars(); + bars.setGlobalActionHandler(ActionFactory.COPY.getId(), copyAction); + IToolBarManager toolBarManager = bars.getToolBarManager(); + toolBarManager.add(exportAction); + toolBarManager.add(importAction); + toolBarManager.add(new Separator()); + toolBarManager.add(clearAction); + toolBarManager.add(deleteLogAction); + toolBarManager.add(viewLogAction); + toolBarManager.add(readLogAction); + toolBarManager.add(new Separator()); + IMenuManager mgr = bars.getMenuManager(); + mgr.add(filterAction); + mgr.add(new Separator()); + mgr.add(activateViewAction); + } + + private void createViewer(TableTree tableTree) { + tableTreeViewer = new TableTreeViewer(tableTree); + tableTreeViewer.setContentProvider(new LogViewContentProvider(this)); + tableTreeViewer.setLabelProvider(new LogViewLabelProvider()); + tableTreeViewer.addSelectionChangedListener(new ISelectionChangedListener() { + public void selectionChanged(SelectionChangedEvent e) { + handleSelectionChanged(e.getSelection()); + if (propertiesAction.isEnabled()) + ((EventDetailsDialogAction) propertiesAction).resetSelection(); + } + }); + tableTreeViewer.addDoubleClickListener(new IDoubleClickListener() { + public void doubleClick(DoubleClickEvent event) { + ((EventDetailsDialogAction) propertiesAction).setComparator(comparator); + propertiesAction.run(); + } + }); + tableTreeViewer.addTreeListener(new ITreeViewerListener() { + public void treeCollapsed(TreeExpansionEvent event) { + applyFonts(); + } + + public void treeExpanded(TreeExpansionEvent event) { + applyFonts(); + } + }); + addMouseListeners(); + tableTreeViewer.setInput(Platform.class); + } + + private void createPopupMenuManager(TableTree tableTree) { + MenuManager popupMenuManager = new MenuManager(); + IMenuListener listener = new IMenuListener() { + public void menuAboutToShow(IMenuManager mng) { + fillContextMenu(mng); + } + }; + popupMenuManager.addMenuListener(listener); + popupMenuManager.setRemoveAllWhenShown(true); + Menu menu = popupMenuManager.createContextMenu(tableTree); + tableTree.setMenu(menu); + } + + private void createColumns(Table table) { + column0 = new TableColumn(table, SWT.NULL); + column0.setText(""); //$NON-NLS-1$ + column1 = new TableColumn(table, SWT.NULL); + column1.setText(PHPDebugCorePlugin.getResourceString("LogView.column.severity")); //$NON-NLS-1$ + column2 = new TableColumn(table, SWT.NULL); + column2.setText(PHPDebugCorePlugin.getResourceString("LogView.column.message")); //$NON-NLS-1$ + column2.addSelectionListener(new SelectionAdapter() { + public void widgetSelected(SelectionEvent e) { + MESSAGE_ORDER *= -1; + ViewerSorter sorter = getViewerSorter(MESSAGE); + tableTreeViewer.setSorter(sorter); + collator = sorter.getCollator(); + boolean isComparatorSet = ((EventDetailsDialogAction) propertiesAction).resetSelection(MESSAGE, MESSAGE_ORDER); + setComparator(MESSAGE); + if (!isComparatorSet) + ((EventDetailsDialogAction) propertiesAction).setComparator(comparator); + applyFonts(); + } + }); + column3 = new TableColumn(table, SWT.NULL); + column3.setText(PHPDebugCorePlugin.getResourceString("LogView.column.plugin")); //$NON-NLS-1$ + column3.addSelectionListener(new SelectionAdapter() { + public void widgetSelected(SelectionEvent e) { + PLUGIN_ORDER *= -1; + ViewerSorter sorter = getViewerSorter(PLUGIN); + tableTreeViewer.setSorter(sorter); + collator = sorter.getCollator(); + boolean isComparatorSet = ((EventDetailsDialogAction) propertiesAction).resetSelection(PLUGIN, PLUGIN_ORDER); + setComparator(PLUGIN); + if (!isComparatorSet) + ((EventDetailsDialogAction) propertiesAction).setComparator(comparator); + applyFonts(); + } + }); + column4 = new TableColumn(table, SWT.NULL); + column4.setText(PHPDebugCorePlugin.getResourceString("LogView.column.date")); //$NON-NLS-1$ + column4.addSelectionListener(new SelectionAdapter() { + public void widgetSelected(SelectionEvent e) { + if (DATE_ORDER == ASCENDING) { + DATE_ORDER = DESCENDING; + } else { + DATE_ORDER = ASCENDING; + } + ViewerSorter sorter = getViewerSorter(DATE); + tableTreeViewer.setSorter(sorter); + collator = sorter.getCollator(); + boolean isComparatorSet = ((EventDetailsDialogAction) propertiesAction).resetSelection(DATE, DATE_ORDER); + setComparator(DATE); + if (!isComparatorSet) + ((EventDetailsDialogAction) propertiesAction).setComparator(comparator); + applyFonts(); + } + }); + TableLayout tlayout = new TableLayout(); + tlayout.addColumnData(new ColumnPixelData(21)); + tlayout.addColumnData(new ColumnPixelData(memento.getInteger(P_COLUMN_1).intValue())); + tlayout.addColumnData(new ColumnPixelData(memento.getInteger(P_COLUMN_2).intValue())); + tlayout.addColumnData(new ColumnPixelData(memento.getInteger(P_COLUMN_3).intValue())); + tlayout.addColumnData(new ColumnPixelData(memento.getInteger(P_COLUMN_4).intValue())); + table.setLayout(tlayout); + table.setHeaderVisible(true); + } + + private void makeActions(Table table) { + propertiesAction = new EventDetailsDialogAction(table.getShell(), tableTreeViewer); + propertiesAction.setImageDescriptor(PHPDegugCorePluginImages.DESC_PROPERTIES); + propertiesAction.setDisabledImageDescriptor(PHPDegugCorePluginImages.DESC_PROPERTIES_DISABLED); + propertiesAction.setToolTipText(PHPDebugCorePlugin.getResourceString("LogView.properties.tooltip")); //$NON-NLS-1$ + propertiesAction.setEnabled(false); + clearAction = new Action(PHPDebugCorePlugin.getResourceString("LogView.clear")) { //$NON-NLS-1$ + public void run() { + handleClear(); + } + }; + clearAction.setImageDescriptor(PHPDegugCorePluginImages.DESC_CLEAR); + clearAction.setDisabledImageDescriptor(PHPDegugCorePluginImages.DESC_CLEAR_DISABLED); + clearAction.setToolTipText(PHPDebugCorePlugin.getResourceString("LogView.clear.tooltip")); //$NON-NLS-1$ + clearAction.setText(PHPDebugCorePlugin.getResourceString("LogView.clear")); //$NON-NLS-1$ + readLogAction = new Action(PHPDebugCorePlugin.getResourceString("LogView.readLog.restore")) { //$NON-NLS-1$ + public void run() { + inputFile = Platform.getLogFileLocation().toFile(); + reloadLog(); + } + }; + readLogAction.setToolTipText(PHPDebugCorePlugin.getResourceString("LogView.readLog.restore.tooltip")); //$NON-NLS-1$ + readLogAction.setImageDescriptor(PHPDegugCorePluginImages.DESC_READ_LOG); + readLogAction.setDisabledImageDescriptor(PHPDegugCorePluginImages.DESC_READ_LOG_DISABLED); + deleteLogAction = new Action(PHPDebugCorePlugin.getResourceString("LogView.delete")) { //$NON-NLS-1$ + public void run() { + doDeleteLog(); + } + }; + deleteLogAction.setToolTipText(PHPDebugCorePlugin.getResourceString("LogView.delete.tooltip")); //$NON-NLS-1$ + deleteLogAction.setImageDescriptor(PHPDegugCorePluginImages.DESC_REMOVE_LOG); + deleteLogAction.setDisabledImageDescriptor(PHPDegugCorePluginImages.DESC_REMOVE_LOG_DISABLED); + deleteLogAction.setEnabled(inputFile.exists() && inputFile.equals(Platform.getLogFileLocation().toFile())); + copyAction = new Action(PHPDebugCorePlugin.getResourceString("LogView.copy")) { //$NON-NLS-1$ + public void run() { + copyToClipboard(tableTreeViewer.getSelection()); + } + }; + copyAction.setImageDescriptor(PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(ISharedImages.IMG_TOOL_COPY)); + filterAction = new Action(PHPDebugCorePlugin.getResourceString("LogView.filter")) { //$NON-NLS-1$ + public void run() { + handleFilter(); + } + }; + filterAction.setToolTipText(PHPDebugCorePlugin.getResourceString("LogView.filter")); //$NON-NLS-1$ + filterAction.setImageDescriptor(PHPDegugCorePluginImages.DESC_FILTER); + filterAction.setDisabledImageDescriptor(PHPDegugCorePluginImages.DESC_FILTER_DISABLED); + exportAction = new Action(PHPDebugCorePlugin.getResourceString("LogView.export")) { //$NON-NLS-1$ + public void run() { + handleExport(); + } + }; + exportAction.setToolTipText(PHPDebugCorePlugin.getResourceString("LogView.export.tooltip")); //$NON-NLS-1$ + exportAction.setImageDescriptor(PHPDegugCorePluginImages.DESC_EXPORT); + exportAction.setDisabledImageDescriptor(PHPDegugCorePluginImages.DESC_EXPORT_DISABLED); + importAction = new Action(PHPDebugCorePlugin.getResourceString("LogView.import")) { //$NON-NLS-1$ + public void run() { + handleImport(); + } + }; + importAction.setToolTipText(PHPDebugCorePlugin.getResourceString("LogView.import.tooltip")); //$NON-NLS-1$ + importAction.setImageDescriptor(PHPDegugCorePluginImages.DESC_IMPORT); + importAction.setDisabledImageDescriptor(PHPDegugCorePluginImages.DESC_IMPORT_DISABLED); + activateViewAction = new Action(PHPDebugCorePlugin.getResourceString("LogView.activate")) { //$NON-NLS-1$ + public void run() { + } + }; + activateViewAction.setChecked(memento.getString(P_ACTIVATE).equals("true")); //$NON-NLS-1$ + viewLogAction = new Action(PHPDebugCorePlugin.getResourceString("LogView.view.currentLog")) { //$NON-NLS-1$ + public void run() { + if (inputFile.exists()) { + if (inputFile.length() > LogReader.MAX_FILE_LENGTH) { + OpenLogDialog openDialog = new OpenLogDialog(getViewSite().getShell(), inputFile); + openDialog.create(); + openDialog.open(); + } else { + boolean canLaunch = Program.launch(inputFile.getAbsolutePath()); + if (!canLaunch) { + Program p = Program.findProgram(".txt"); //$NON-NLS-1$ + if (p != null) + p.execute(inputFile.getAbsolutePath()); + else { + OpenLogDialog openDialog = new OpenLogDialog(getViewSite().getShell(), inputFile); + openDialog.create(); + openDialog.open(); + } + } + } + } + } + }; + viewLogAction.setImageDescriptor(PHPDegugCorePluginImages.DESC_OPEN_LOG); + viewLogAction.setDisabledImageDescriptor(PHPDegugCorePluginImages.DESC_OPEN_LOG_DISABLED); + viewLogAction.setEnabled(inputFile.exists()); + viewLogAction.setToolTipText(PHPDebugCorePlugin.getResourceString("LogView.view.currentLog.tooltip")); //$NON-NLS-1$ + } + + public void dispose() { + Platform.removeLogListener(this); + clipboard.dispose(); + LogReader.reset(); + boldFont.dispose(); + super.dispose(); + } + + private void handleImport() { + FileDialog dialog = new FileDialog(getViewSite().getShell()); + dialog.setFilterExtensions(new String[] { "*.log" }); //$NON-NLS-1$ + if (directory != null) + dialog.setFilterPath(directory); + String path = dialog.open(); + if (path != null && new Path(path).toFile().exists()) { + inputFile = new Path(path).toFile(); + directory = inputFile.getParent(); + IRunnableWithProgress op = new IRunnableWithProgress() { + public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { + monitor.beginTask(PHPDebugCorePlugin.getResourceString("LogView.operation.importing"), IProgressMonitor.UNKNOWN); //$NON-NLS-1$ + readLogFile(); + } + }; + ProgressMonitorDialog pmd = new ProgressMonitorDialog(getViewSite().getShell()); + try { + pmd.run(true, true, op); + } catch (InvocationTargetException e) { + } catch (InterruptedException e) { + } finally { + readLogAction.setText(PHPDebugCorePlugin.getResourceString("LogView.readLog.reload")); //$NON-NLS-1$ + readLogAction.setToolTipText(PHPDebugCorePlugin.getResourceString("LogView.readLog.reload")); //$NON-NLS-1$ + asyncRefresh(false); + resetDialogButtons(); + } + } + } + + private void handleExport() { + FileDialog dialog = new FileDialog(getViewSite().getShell(), SWT.SAVE); + dialog.setFilterExtensions(new String[] { "*.log" }); //$NON-NLS-1$ + if (directory != null) + dialog.setFilterPath(directory); + String path = dialog.open(); + if (path != null) { + if (!path.endsWith(".log")) //$NON-NLS-1$ + path += ".log"; //$NON-NLS-1$ + File outputFile = new Path(path).toFile(); + directory = outputFile.getParent(); + if (outputFile.exists()) { + String message = PHPDebugCorePlugin.getFormattedMessage("LogView.confirmOverwrite.message", //$NON-NLS-1$ + outputFile.toString()); + if (!MessageDialog.openQuestion(getViewSite().getShell(), exportAction.getText(), message)) + return; + } + copy(inputFile, outputFile); + } + } + + private void copy(File inputFile, File outputFile) { + BufferedReader reader = null; + BufferedWriter writer = null; + try { + reader = new BufferedReader(new InputStreamReader(new FileInputStream(inputFile), "UTF-8")); //$NON-NLS-1$ + writer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(outputFile), "UTF-8")); //$NON-NLS-1$ + while (reader.ready()) { + writer.write(reader.readLine()); + writer.write(System.getProperty("line.separator")); //$NON-NLS-1$ + } + } catch (IOException e) { + } finally { + try { + if (reader != null) + reader.close(); + if (writer != null) + writer.close(); + } catch (IOException e1) { + } + } + } + + private void handleFilter() { + FilterDialog dialog = new FilterDialog(PHPDebugCorePlugin.getActiveWorkbenchShell(), memento); + dialog.create(); + dialog.getShell().setText(PHPDebugCorePlugin.getResourceString("LogView.FilterDialog.title")); //$NON-NLS-1$ + if (dialog.open() == FilterDialog.OK) + reloadLog(); + } + + private void doDeleteLog() { + String title = PHPDebugCorePlugin.getResourceString("LogView.confirmDelete.title"); //$NON-NLS-1$ + String message = PHPDebugCorePlugin.getResourceString("LogView.confirmDelete.message"); //$NON-NLS-1$ + if (!MessageDialog.openConfirm(tableTreeViewer.getControl().getShell(), title, message)) + return; + if (inputFile.delete()) { + logs.clear(); + asyncRefresh(false); + resetDialogButtons(); + } + } + + public void fillContextMenu(IMenuManager manager) { + manager.add(copyAction); + manager.add(new Separator()); + manager.add(clearAction); + manager.add(deleteLogAction); + manager.add(viewLogAction); + manager.add(readLogAction); + manager.add(new Separator()); + manager.add(exportAction); + manager.add(importAction); + manager.add(new Separator()); + ((EventDetailsDialogAction) propertiesAction).setComparator(comparator); + manager.add(propertiesAction); + } + + public LogEntry[] getLogs() { + return (LogEntry[]) logs.toArray(new LogEntry[logs.size()]); + } + + protected void handleClear() { + BusyIndicator.showWhile(tableTreeViewer.getControl().getDisplay(), new Runnable() { + public void run() { + logs.clear(); + asyncRefresh(false); + resetDialogButtons(); + } + }); + } + + protected void reloadLog() { + IRunnableWithProgress op = new IRunnableWithProgress() { + public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { + monitor.beginTask(PHPDebugCorePlugin.getResourceString("LogView.operation.reloading"), //$NON-NLS-1$ + IProgressMonitor.UNKNOWN); + readLogFile(); + } + }; + ProgressMonitorDialog pmd = new ProgressMonitorDialog(getViewSite().getShell()); + try { + pmd.run(true, true, op); + } catch (InvocationTargetException e) { + } catch (InterruptedException e) { + } finally { + readLogAction.setText(PHPDebugCorePlugin.getResourceString("LogView.readLog.restore")); //$NON-NLS-1$ + readLogAction.setToolTipText(PHPDebugCorePlugin.getResourceString("LogView.readLog.restore")); //$NON-NLS-1$ + asyncRefresh(false); + resetDialogButtons(); + } + } + + private void readLogFile() { + logs.clear(); + if (!inputFile.exists()) + return; + if (inputFile.length() > LogReader.MAX_FILE_LENGTH) + LogReader.parseLargeFile(inputFile, logs, memento); + else + LogReader.parseLogFile(inputFile, logs, memento); + } + + public void logging(IStatus status, String plugin) { + if (!inputFile.equals(Platform.getLogFileLocation().toFile())) + return; + if (firstEvent) { + readLogFile(); + asyncRefresh(); + firstEvent = false; + } else { + pushStatus(status); + } + } + + private void pushStatus(IStatus status) { + LogEntry entry = new LogEntry(status); + LogReader.addEntry(entry, logs, memento, true); + asyncRefresh(); + } + + private void asyncRefresh() { + asyncRefresh(true); + } + + private void asyncRefresh(final boolean activate) { + final Control control = tableTreeViewer.getControl(); + if (control.isDisposed()) + return; + Display display = control.getDisplay(); + final ViewPart view = this; + if (display != null) { + display.asyncExec(new Runnable() { + public void run() { + if (!control.isDisposed()) { + tableTreeViewer.refresh(); + deleteLogAction.setEnabled(inputFile.exists() && inputFile.equals(Platform.getLogFileLocation().toFile())); + viewLogAction.setEnabled(inputFile.exists()); + if (activate && activateViewAction.isChecked()) { + IWorkbenchPage page = PHPDebugCorePlugin.getActivePage(); + if (page != null) + page.bringToTop(view); + } + } + applyFonts(); + } + }); + } + } + + public void setFocus() { + if (tableTreeViewer != null && !tableTreeViewer.getTableTree().isDisposed()) + tableTreeViewer.getTableTree().getTable().setFocus(); + } + + private void handleSelectionChanged(ISelection selection) { + updateStatus(selection); + copyAction.setEnabled(!selection.isEmpty()); + propertiesAction.setEnabled(!selection.isEmpty()); + } + + private void updateStatus(ISelection selection) { + IStatusLineManager status = getViewSite().getActionBars().getStatusLineManager(); + if (selection.isEmpty()) + status.setMessage(null); + else { + LogEntry entry = (LogEntry) ((IStructuredSelection) selection).getFirstElement(); + status.setMessage(((LogViewLabelProvider) tableTreeViewer.getLabelProvider()).getColumnText(entry, 2)); + } + } + + private void copyToClipboard(ISelection selection) { + StringWriter writer = new StringWriter(); + PrintWriter pwriter = new PrintWriter(writer); + if (selection.isEmpty()) + return; + LogEntry entry = (LogEntry) ((IStructuredSelection) selection).getFirstElement(); + entry.write(pwriter); + pwriter.flush(); + String textVersion = writer.toString(); + try { + pwriter.close(); + writer.close(); + } catch (IOException e) { + } + if (textVersion.trim().length() > 0) { + // set the clipboard contents + clipboard.setContents(new Object[] { textVersion }, new Transfer[] { TextTransfer.getInstance() }); + } + } + + public void init(IViewSite site, IMemento memento) throws PartInitException { + super.init(site, memento); + if (memento == null) + this.memento = XMLMemento.createWriteRoot("LOGVIEW"); //$NON-NLS-1$ + else + this.memento = memento; + initializeMemento(); + } + + private void initializeMemento() { + if (memento.getString(P_USE_LIMIT) == null) + memento.putString(P_USE_LIMIT, "true"); //$NON-NLS-1$ + if (memento.getInteger(P_LOG_LIMIT) == null) + memento.putInteger(P_LOG_LIMIT, 50); + if (memento.getString(P_LOG_INFO) == null) + memento.putString(P_LOG_INFO, "true"); //$NON-NLS-1$ + if (memento.getString(P_LOG_WARNING) == null) + memento.putString(P_LOG_WARNING, "true"); //$NON-NLS-1$ + if (memento.getString(P_LOG_ERROR) == null) + memento.putString(P_LOG_ERROR, "true"); //$NON-NLS-1$ + if (memento.getString(P_SHOW_ALL_SESSIONS) == null) + memento.putString(P_SHOW_ALL_SESSIONS, "true"); //$NON-NLS-1$ + Integer width = memento.getInteger(P_COLUMN_1); + if (width == null || width.intValue() == 0) + memento.putInteger(P_COLUMN_1, 20); + width = memento.getInteger(P_COLUMN_2); + if (width == null || width.intValue() == 0) + memento.putInteger(P_COLUMN_2, 300); + width = memento.getInteger(P_COLUMN_3); + if (width == null || width.intValue() == 0) + memento.putInteger(P_COLUMN_3, 150); + width = memento.getInteger(P_COLUMN_4); + if (width == null || width.intValue() == 0) + memento.putInteger(P_COLUMN_4, 150); + if (memento.getString(P_ACTIVATE) == null) + memento.putString(P_ACTIVATE, "true"); //$NON-NLS-1$ + } + + public void saveState(IMemento memento) { + if (this.memento == null || memento == null) + return; + this.memento.putInteger(P_COLUMN_1, column1.getWidth()); + this.memento.putInteger(P_COLUMN_2, column2.getWidth()); + this.memento.putInteger(P_COLUMN_3, column3.getWidth()); + this.memento.putInteger(P_COLUMN_4, column4.getWidth()); + this.memento.putString(P_ACTIVATE, activateViewAction.isChecked() ? "true" : "false"); //$NON-NLS-1$ //$NON-NLS-2$ + memento.putMemento(this.memento); + } + + private void addMouseListeners() { + Listener tableListener = new Listener() { + public void handleEvent(Event e) { + switch (e.type) { + case SWT.MouseMove: + onMouseMove(e); + break; + case SWT.MouseHover: + onMouseHover(e); + break; + case SWT.MouseDown: + onMouseDown(e); + break; + } + } + }; + int[] tableEvents = new int[] { SWT.MouseDown, SWT.MouseMove, SWT.MouseHover }; + for (int i = 0; i < tableEvents.length; i++) { + tableTreeViewer.getTableTree().getTable().addListener(tableEvents[i], tableListener); + } + } + + private void makeHoverShell() { + Control control = tableTreeViewer.getControl(); + textShell = new Shell(control.getShell(), SWT.NO_FOCUS | SWT.ON_TOP); + Display display = textShell.getDisplay(); + textShell.setBackground(display.getSystemColor(SWT.COLOR_INFO_BACKGROUND)); + GridLayout layout = new GridLayout(1, false); + int border = ((control.getShell().getStyle() & SWT.NO_TRIM) == 0) ? 0 : 1; + layout.marginHeight = border; + layout.marginWidth = border; + textShell.setLayout(layout); + textShell.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + Composite shellComposite = new Composite(textShell, SWT.NONE); + layout = new GridLayout(); + layout.marginHeight = 0; + layout.marginWidth = 0; + shellComposite.setLayout(layout); + shellComposite.setLayoutData(new GridData(GridData.FILL_BOTH | GridData.VERTICAL_ALIGN_BEGINNING)); + textLabel = new Text(shellComposite, SWT.WRAP | SWT.MULTI); + GridData gd = new GridData(GridData.FILL_BOTH); + gd.widthHint = 100; + gd.grabExcessHorizontalSpace = true; + textLabel.setLayoutData(gd); + Color c = control.getDisplay().getSystemColor(SWT.COLOR_INFO_BACKGROUND); + textLabel.setBackground(c); + c = control.getDisplay().getSystemColor(SWT.COLOR_INFO_FOREGROUND); + textLabel.setForeground(c); + textLabel.setEditable(false); + textShell.addDisposeListener(new DisposeListener() { + public void widgetDisposed(DisposeEvent e) { + onTextShellDispose(e); + } + }); + } + + void onTextShellDispose(DisposeEvent e) { + canOpenTextShell = true; + setFocus(); + } + + void onMouseDown(Event e) { + if (textShell != null && !textShell.isDisposed() && !textShell.isFocusControl()) { + textShell.close(); + canOpenTextShell = true; + } + } + + void onMouseHover(Event e) { + if (!canOpenTextShell) + return; + canOpenTextShell = false; + Point point = new Point(e.x, e.y); + TableTree table = tableTreeViewer.getTableTree(); + TableTreeItem item = table.getItem(point); + if (item == null) + return; + String message = ((LogEntry) item.getData()).getStack(); + if (message == null) + return; + makeHoverShell(); + textLabel.setText(message); + int x = point.x + 5; + int y = point.y - (table.getItemHeight() * 2) - 20; + textShell.setLocation(table.toDisplay(x, y)); + textShell.setSize(tableTreeViewer.getTableTree().getSize().x - x, 125); + textShell.open(); + setFocus(); + } + + void onMouseMove(Event e) { + if (textShell != null && !textShell.isDisposed()) { + textShell.close(); + canOpenTextShell = textShell.isDisposed() && e.x > column0.getWidth() && e.x < (column0.getWidth() + column1.getWidth()); + } else { + canOpenTextShell = e.x > column0.getWidth() && e.x < (column0.getWidth() + column1.getWidth()); + } + } + + public Comparator getComparator() { + return comparator; + } + + private void setComparator(byte sortType) { + if (sortType == DATE) { + comparator = new Comparator() { + public int compare(Object e1, Object e2) { + try { + SimpleDateFormat formatter = new SimpleDateFormat("MMM dd, yyyy HH:mm:ss.SS"); //$NON-NLS-1$ + Date date1 = formatter.parse(((LogEntry) e1).getDate()); + Date date2 = formatter.parse(((LogEntry) e2).getDate()); + if (DATE_ORDER == ASCENDING) + return date1.before(date2) ? -1 : 1; + return date1.after(date2) ? -1 : 1; + } catch (ParseException e) { + } + return 0; + } + }; + } else if (sortType == PLUGIN) { + comparator = new Comparator() { + public int compare(Object e1, Object e2) { + LogEntry entry1 = (LogEntry) e1; + LogEntry entry2 = (LogEntry) e2; + return collator.compare(entry1.getPluginId(), entry2.getPluginId()) * PLUGIN_ORDER; + } + }; + } else { + comparator = new Comparator() { + public int compare(Object e1, Object e2) { + LogEntry entry1 = (LogEntry) e1; + LogEntry entry2 = (LogEntry) e2; + return collator.compare(entry1.getMessage(), entry2.getMessage()) * MESSAGE_ORDER; + } + }; + } + } + + private ViewerSorter getViewerSorter(byte sortType) { + if (sortType == PLUGIN) { + return new ViewerSorter() { + public int compare(Viewer viewer, Object e1, Object e2) { + LogEntry entry1 = (LogEntry) e1; + LogEntry entry2 = (LogEntry) e2; + return super.compare(viewer, entry1.getPluginId(), entry2.getPluginId()) * PLUGIN_ORDER; + } + }; + } else if (sortType == MESSAGE) { + return new ViewerSorter() { + public int compare(Viewer viewer, Object e1, Object e2) { + LogEntry entry1 = (LogEntry) e1; + LogEntry entry2 = (LogEntry) e2; + return super.compare(viewer, entry1.getMessage(), entry2.getMessage()) * MESSAGE_ORDER; + } + }; + } else { + return new ViewerSorter() { + public int compare(Viewer viewer, Object e1, Object e2) { + try { + SimpleDateFormat formatter = new SimpleDateFormat("MMM dd, yyyy HH:mm:ss.SS"); //$NON-NLS-1$ + Date date1 = formatter.parse(((LogEntry) e1).getDate()); + Date date2 = formatter.parse(((LogEntry) e2).getDate()); + if (DATE_ORDER == ASCENDING) + return date1.before(date2) ? -1 : 1; + return date1.after(date2) ? -1 : 1; + } catch (ParseException e) { + } + return 0; + } + }; + } + } + + private void resetDialogButtons() { + ((EventDetailsDialogAction) propertiesAction).resetDialogButtons(); + } +} \ No newline at end of file diff --git a/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/logview/LogViewContentProvider.java b/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/logview/LogViewContentProvider.java new file mode 100644 index 0000000..fc0e550 --- /dev/null +++ b/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/logview/LogViewContentProvider.java @@ -0,0 +1,43 @@ +/******************************************************************************* + * Copyright (c) 2000, 2003 IBM Corporation and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Common Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/cpl-v10.html + * + * Contributors: + * IBM Corporation - initial API and implementation + *******************************************************************************/ +package net.sourceforge.phpdt.internal.debug.core.logview; + +import org.eclipse.jface.viewers.IStructuredContentProvider; +import org.eclipse.jface.viewers.ITreeContentProvider; +import org.eclipse.jface.viewers.Viewer; + +public class LogViewContentProvider + implements ITreeContentProvider, IStructuredContentProvider { + private LogView logView; + + public LogViewContentProvider(LogView logView) { + this.logView = logView; + } + public void dispose() { + } + public Object[] getChildren(Object element) { + return ((LogEntry) element).getChildren(element); + } + public Object[] getElements(Object element) { + return logView.getLogs(); + } + public Object getParent(Object element) { + return ((LogEntry) element).getParent(element); + } + public boolean hasChildren(Object element) { + return ((LogEntry) element).hasChildren(); + } + public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { + } + public boolean isDeleted(Object element) { + return false; + } +} diff --git a/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/logview/LogViewLabelProvider.java b/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/logview/LogViewLabelProvider.java new file mode 100644 index 0000000..96d532d --- /dev/null +++ b/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/logview/LogViewLabelProvider.java @@ -0,0 +1,68 @@ +/******************************************************************************* + * Copyright (c) 2000, 2004 IBM Corporation and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Common Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/cpl-v10.html + * + * Contributors: + * IBM Corporation - initial API and implementation + *******************************************************************************/ +package net.sourceforge.phpdt.internal.debug.core.logview; + +import net.sourceforge.phpdt.internal.debug.core.PHPDegugCorePluginImages; + +import org.eclipse.core.runtime.IStatus; +import org.eclipse.jface.viewers.ITableLabelProvider; +import org.eclipse.jface.viewers.LabelProvider; +import org.eclipse.swt.graphics.Image; + +public class LogViewLabelProvider + extends LabelProvider + implements ITableLabelProvider { + private Image infoImage; + private Image errorImage; + private Image warningImage; + private Image errorWithStackImage; + + public LogViewLabelProvider() { + errorImage = PHPDegugCorePluginImages.DESC_ERROR_ST_OBJ.createImage(); + warningImage = PHPDegugCorePluginImages.DESC_WARNING_ST_OBJ.createImage(); + infoImage = PHPDegugCorePluginImages.DESC_INFO_ST_OBJ.createImage(); + errorWithStackImage = PHPDegugCorePluginImages.DESC_ERROR_STACK_OBJ.createImage(); + } + public void dispose() { + errorImage.dispose(); + infoImage.dispose(); + warningImage.dispose(); + errorWithStackImage.dispose(); + super.dispose(); + } + public Image getColumnImage(Object element, int columnIndex) { + LogEntry entry = (LogEntry) element; + if (columnIndex == 1) { + switch (entry.getSeverity()) { + case IStatus.INFO : + return infoImage; + case IStatus.WARNING : + return warningImage; + case IStatus.ERROR : + return (entry.getStack() == null ? errorImage : errorWithStackImage); + } + } + return null; + } + + public String getColumnText(Object element, int columnIndex) { + LogEntry entry = (LogEntry) element; + switch (columnIndex) { + case 2 : + return entry.getMessage(); + case 3 : + return entry.getPluginId(); + case 4 : + return entry.getDate(); + } + return ""; //$NON-NLS-1$ + } +} diff --git a/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/logview/OpenLogDialog.java b/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/logview/OpenLogDialog.java new file mode 100644 index 0000000..ed150df --- /dev/null +++ b/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/logview/OpenLogDialog.java @@ -0,0 +1,270 @@ +/******************************************************************************* + * Copyright (c) 2003, 2004 IBM Corporation and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Common Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/cpl-v10.html + * + * Contributors: + * IBM Corporation - initial API and implementation + *******************************************************************************/ + +package net.sourceforge.phpdt.internal.debug.core.logview; + +import java.io.BufferedReader; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileReader; +import java.io.IOException; +import java.io.PrintWriter; +import java.io.RandomAccessFile; +import java.io.StringWriter; +import java.lang.reflect.InvocationTargetException; + +import net.sourceforge.phpdt.internal.debug.core.PHPDebugCorePlugin; + +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.jface.dialogs.Dialog; +import org.eclipse.jface.dialogs.IDialogConstants; +import org.eclipse.jface.dialogs.IDialogSettings; +import org.eclipse.jface.dialogs.ProgressMonitorDialog; +import org.eclipse.jface.operation.IRunnableWithProgress; +import org.eclipse.swt.SWT; +import org.eclipse.swt.graphics.Point; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.swt.widgets.Text; + +/** + * Displays the error log in non-Win32 platforms - see bug 55314. + */ +public final class OpenLogDialog extends Dialog { + // input log file + private File logFile; + // location/size configuration + private IDialogSettings dialogSettings; + private Point dialogLocation; + private Point dialogSize; + private int DEFAULT_WIDTH = 750; + private int DEFAULT_HEIGHT = 800; + + public OpenLogDialog(Shell parentShell, File logFile) { + super(parentShell); + this.logFile = logFile; + setShellStyle(SWT.DIALOG_TRIM | SWT.RESIZE | SWT.MAX | SWT.MIN | SWT.MODELESS); + + } + + /* + * (non-Javadoc) Method declared on Window. + */ + protected void configureShell(Shell newShell) { + super.configureShell(newShell); + newShell.setText(PHPDebugCorePlugin.getResourceString("OpenLogDialog.title")); //$NON-NLS-1$ + readConfiguration(); + } + + /* + * (non-Javadoc) Method declared on Dialog. + */ + protected void createButtonsForButtonBar(Composite parent) { + createButton(parent, IDialogConstants.CLOSE_ID, IDialogConstants.CLOSE_LABEL, + true); + } + + public void create() { + super.create(); + // dialog location + if (dialogLocation != null) + getShell().setLocation(dialogLocation); + // dialog size + if (dialogSize != null) + getShell().setSize(dialogSize); + else + getShell().setSize(DEFAULT_WIDTH, DEFAULT_HEIGHT); + getButton(IDialogConstants.CLOSE_ID).setFocus(); + } + + /* + * (non-Javadoc) Method declared on Dialog. + */ + protected Control createDialogArea(Composite parent) { + Composite outer = (Composite) super.createDialogArea(parent); + Text text = new Text(outer, SWT.MULTI | SWT.BORDER | SWT.READ_ONLY | SWT.V_SCROLL + | SWT.NO_FOCUS | SWT.H_SCROLL); + text.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_LIST_BACKGROUND)); + GridData gridData = new GridData(GridData.HORIZONTAL_ALIGN_FILL + | GridData.VERTICAL_ALIGN_FILL); + gridData.grabExcessVerticalSpace = true; + gridData.grabExcessHorizontalSpace = true; + text.setLayoutData(gridData); + text.setText(getLogSummary()); + return outer; + } + + private String getLogSummary() { + StringWriter out = new StringWriter(); + PrintWriter writer = new PrintWriter(out); + if (logFile.length() > LogReader.MAX_FILE_LENGTH) { + readLargeFileWithMonitor(writer); + } else { + readFileWithMonitor(writer); + } + writer.close(); + return out.toString(); + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.jface.dialogs.Dialog#buttonPressed(int) + */ + protected void buttonPressed(int buttonId) { + if (buttonId == IDialogConstants.CLOSE_ID) { + storeSettings(); + close(); + } + super.buttonPressed(buttonId); + } + + //--------------- configuration handling -------------- + /** + * Stores the current state in the dialog settings. + * + * @since 2.0 + */ + private void storeSettings() { + writeConfiguration(); + } + + /** + * Returns the dialog settings object used to share state between several + * event detail dialogs. + * + * @return the dialog settings to be used + */ + private IDialogSettings getDialogSettings() { + IDialogSettings settings = PHPDebugCorePlugin.getDefault().getDialogSettings(); + dialogSettings = settings.getSection(getClass().getName()); + if (dialogSettings == null) + dialogSettings = settings.addNewSection(getClass().getName()); + return dialogSettings; + } + + /** + * Initializes itself from the dialog settings with the same state as at the + * previous invocation. + */ + private void readConfiguration() { + IDialogSettings s = getDialogSettings(); + try { + int x = s.getInt("x"); //$NON-NLS-1$ + int y = s.getInt("y"); //$NON-NLS-1$ + dialogLocation = new Point(x, y); + x = s.getInt("width"); //$NON-NLS-1$ + y = s.getInt("height"); //$NON-NLS-1$ + dialogSize = new Point(x, y); + } catch (NumberFormatException e) { + dialogLocation = null; + dialogSize = null; + } + } + + private void writeConfiguration() { + IDialogSettings s = getDialogSettings(); + Point location = getShell().getLocation(); + s.put("x", location.x); //$NON-NLS-1$ + s.put("y", location.y); //$NON-NLS-1$ + Point size = getShell().getSize(); + s.put("width", size.x); //$NON-NLS-1$ + s.put("height", size.y); //$NON-NLS-1$ + } + + // reading file within MAX_FILE_LENGTH size + private void readFile(PrintWriter writer) throws FileNotFoundException, IOException { + BufferedReader bReader = new BufferedReader(new FileReader(logFile)); + while (bReader.ready()) + writer.println(bReader.readLine()); + } + + // reading large files + private void readLargeFile(PrintWriter writer) throws FileNotFoundException, + IOException { + RandomAccessFile random = null; + boolean hasStarted = false; + try { + random = new RandomAccessFile(logFile, "r"); //$NON-NLS-1$ + random.seek(logFile.length() - LogReader.MAX_FILE_LENGTH); + for (;;) { + String line = random.readLine(); + if (line == null) + break; + line = line.trim(); + if (line.length() == 0) + continue; + if (!hasStarted + && (line.startsWith("!ENTRY") || line.startsWith("!SESSION"))) //$NON-NLS-1$ //$NON-NLS-2$ + hasStarted = true; + if (hasStarted) + writer.println(line); + continue; + } + } finally { + try { + if (random != null) + random.close(); + } catch (IOException e1) { + } + } + } + + private void readLargeFileWithMonitor(final PrintWriter writer) { + IRunnableWithProgress runnable = new IRunnableWithProgress() { + public void run(IProgressMonitor monitor) throws InvocationTargetException, + InterruptedException { + monitor + .beginTask( + PHPDebugCorePlugin + .getResourceString("OpenLogDialog.message"), IProgressMonitor.UNKNOWN); //$NON-NLS-1$ + try { + readLargeFile(writer); + } catch (IOException e) { + writer.println(PHPDebugCorePlugin + .getResourceString("OpenLogDialog.cannotDisplay")); //$NON-NLS-1$ + } + } + }; + ProgressMonitorDialog dialog = new ProgressMonitorDialog(getParentShell()); + try { + dialog.run(true, true, runnable); + } catch (InvocationTargetException e) { + } catch (InterruptedException e) { + } + } + + private void readFileWithMonitor(final PrintWriter writer) { + IRunnableWithProgress runnable = new IRunnableWithProgress() { + public void run(IProgressMonitor monitor) throws InvocationTargetException, + InterruptedException { + monitor + .beginTask( + PHPDebugCorePlugin + .getResourceString("OpenLogDialog.message"), IProgressMonitor.UNKNOWN); //$NON-NLS-1$ + try { + readFile(writer); + } catch (IOException e) { + writer.println(PHPDebugCorePlugin + .getResourceString("OpenLogDialog.cannotDisplay")); //$NON-NLS-1$ + } + } + }; + ProgressMonitorDialog dialog = new ProgressMonitorDialog(getParentShell()); + try { + dialog.run(true, true, runnable); + } catch (InvocationTargetException e) { + } catch (InterruptedException e) { + } + } +}