196 plugins/com.aptana.php.debug.epl/META-INF/MANIFEST.MF
View file
@@ -41,165 +41,165 @@ Export-Package: com.aptana.php.debug.core,
com.aptana.php.debug.ui.hover,
com.aptana.php.debug.ui.launching,
com.aptana.php.debug.ui.pathMapper,
org.eclipse.php.debug.core.debugger;uses:="org.eclipse.php.internal.debug.core.zend.debugger,org.eclipse.php.internal.debug.core.zend.model",
org.eclipse.php.debug.core.debugger.handlers;uses:="org.eclipse.php.internal.debug.core.zend.model,org.eclipse.php.debug.core.debugger.messages",
org.eclipse.php.debug.core.debugger.messages,
org.eclipse.php.debug.core.debugger.parameters;uses:="org.eclipse.debug.core",
org.eclipse.php.debug.core.debugger.pathmapper;uses:="org.eclipse.php.internal.debug.core.pathmapper,org.eclipse.php.internal.core.util.preferences",
org.eclipse.php.internal.core.util,
org.eclipse.php.internal.debug.core;
org2.eclipse.php.debug.core.debugger;uses:="org2.eclipse.php.internal.debug.core.zend.debugger,org2.eclipse.php.internal.debug.core.zend.model",
org2.eclipse.php.debug.core.debugger.handlers;uses:="org2.eclipse.php.internal.debug.core.zend.model,org2.eclipse.php.debug.core.debugger.messages",
org2.eclipse.php.debug.core.debugger.messages,
org2.eclipse.php.debug.core.debugger.parameters;uses:="org.eclipse.debug.core",
org2.eclipse.php.debug.core.debugger.pathmapper;uses:="org2.eclipse.php.internal.debug.core.pathmapper,org2.eclipse.php.internal.core.util.preferences",
org2.eclipse.php.internal.core.util,
org2.eclipse.php.internal.debug.core;
uses:="org.eclipse.debug.core,
org.eclipse.osgi.util,
org.eclipse.php.internal.debug.core.launching,
org.eclipse.php.internal.debug.core.zend.debugger",
org.eclipse.php.internal.debug.core.daemon;uses:="com.aptana.php.debug.core.daemon",
org.eclipse.php.internal.debug.core.debugger;uses:="org.eclipse.core.runtime,com.aptana.php.debug.core.daemon,org.eclipse.swt.widgets",
org.eclipse.php.internal.debug.core.interpreter.phpIni,
org.eclipse.php.internal.debug.core.interpreter.preferences,
org.eclipse.php.internal.debug.core.launching;
org2.eclipse.php.internal.debug.core.launching,
org2.eclipse.php.internal.debug.core.zend.debugger",
org2.eclipse.php.internal.debug.core.daemon;uses:="com.aptana.php.debug.core.daemon",
org2.eclipse.php.internal.debug.core.debugger;uses:="org.eclipse.core.runtime,com.aptana.php.debug.core.daemon,org.eclipse.swt.widgets",
org2.eclipse.php.internal.debug.core.interpreter.phpIni,
org2.eclipse.php.internal.debug.core.interpreter.preferences,
org2.eclipse.php.internal.debug.core.launching;
uses:="org.eclipse.debug.core,
org.eclipse.core.runtime,
org.eclipse.ui.browser,
org.eclipse.php.internal.debug.core.zend.communication,
org2.eclipse.php.internal.debug.core.zend.communication,
org.eclipse.debug.core.model,
org.eclipse.php.internal.debug.core.zend.debugger,
org2.eclipse.php.internal.debug.core.zend.debugger,
org.eclipse.core.runtime.jobs,
org.eclipse.core.resources,
org.eclipse.swt.graphics,
org.eclipse.swt.widgets,
org.eclipse.php.debug.core.debugger.parameters,
org2.eclipse.php.debug.core.debugger.parameters,
org.eclipse.jface.dialogs",
org.eclipse.php.internal.debug.core.model;
org2.eclipse.php.internal.debug.core.model;
uses:="org.eclipse.debug.core,
org.eclipse.php.internal.debug.core.zend.debugger,
org.eclipse.php.debug.core.debugger,
org2.eclipse.php.internal.debug.core.zend.debugger,
org2.eclipse.php.debug.core.debugger,
org.eclipse.core.resources,
org.eclipse.php.internal.debug.core.zend.model,
org2.eclipse.php.internal.debug.core.zend.model,
org.eclipse.debug.core.model",
org.eclipse.php.internal.debug.core.pathmapper;
org2.eclipse.php.internal.debug.core.pathmapper;
uses:="org.eclipse.debug.core,
org.eclipse.core.resources,
org.eclipse.php.debug.core.debugger.pathmapper,
org.eclipse.php.internal.debug.core.preferences,
org2.eclipse.php.debug.core.debugger.pathmapper,
org2.eclipse.php.internal.debug.core.preferences,
org.eclipse.debug.core.model",
org.eclipse.php.internal.debug.core.preferences;
org2.eclipse.php.internal.debug.core.preferences;
uses:="org.eclipse.core.runtime,
org.eclipse.core.resources,
org.eclipse.swt.graphics,
org.eclipse.swt.widgets,
org.eclipse.core.runtime.preferences,
org.eclipse.jface.dialogs,
org.eclipse.php.internal.debug.core.debugger",
org.eclipse.php.internal.debug.core.preferences.stepFilters,
org.eclipse.php.internal.debug.core.resources,
org.eclipse.php.internal.debug.core.sourcelookup;
org2.eclipse.php.internal.debug.core.debugger",
org2.eclipse.php.internal.debug.core.preferences.stepFilters,
org2.eclipse.php.internal.debug.core.resources,
org2.eclipse.php.internal.debug.core.sourcelookup;
uses:="org.eclipse.debug.core,
org.eclipse.debug.core.sourcelookup,
org.eclipse.core.runtime,
org.eclipse.debug.core.model",
org.eclipse.php.internal.debug.core.sourcelookup.containers;
org2.eclipse.php.internal.debug.core.sourcelookup.containers;
uses:="org.eclipse.debug.core,
org.eclipse.debug.core.sourcelookup,
org.eclipse.core.runtime,
org.eclipse.core.resources,
org.eclipse.debug.core.sourcelookup.containers",
org.eclipse.php.internal.debug.core.xdebug;
org2.eclipse.php.internal.debug.core.xdebug;
uses:="org.eclipse.debug.core.sourcelookup,
org.eclipse.debug.core,
org.eclipse.core.runtime,
org.eclipse.core.resources,
org.eclipse.php.internal.debug.core.xdebug.dbgp",
org.eclipse.php.internal.debug.core.xdebug.breakpoints;
org2.eclipse.php.internal.debug.core.xdebug.dbgp",
org2.eclipse.php.internal.debug.core.xdebug.breakpoints;
uses:="org.eclipse.debug.core.sourcelookup,
org.eclipse.debug.core,
org.eclipse.core.runtime,
org.eclipse.php.internal.debug.core.xdebug,
org2.eclipse.php.internal.debug.core.xdebug,
org.eclipse.core.resources,
org.eclipse.php.internal.debug.core.model,
org.eclipse.php.internal.debug.core.xdebug.dbgp,
org2.eclipse.php.internal.debug.core.model,
org2.eclipse.php.internal.debug.core.xdebug.dbgp,
org.eclipse.debug.core.model",
org.eclipse.php.internal.debug.core.xdebug.communication;uses:="org.eclipse.php.internal.debug.core.daemon",
org.eclipse.php.internal.debug.core.xdebug.dbgp;
org2.eclipse.php.internal.debug.core.xdebug.communication;uses:="org2.eclipse.php.internal.debug.core.daemon",
org2.eclipse.php.internal.debug.core.xdebug.dbgp;
uses:="org.eclipse.swt.events,
org.eclipse.core.resources,
org.eclipse.php.internal.debug.core.preferences,
org2.eclipse.php.internal.debug.core.preferences,
org.eclipse.swt.widgets,
org.eclipse.debug.core.model,
org.eclipse.php.internal.debug.core.debugger",
org.eclipse.php.internal.debug.core.xdebug.dbgp.model;
org2.eclipse.php.internal.debug.core.debugger",
org2.eclipse.php.internal.debug.core.xdebug.dbgp.model;
uses:="org.eclipse.debug.core,
org.eclipse.core.runtime,
org.eclipse.php.internal.debug.core.xdebug.dbgp.session,
org2.eclipse.php.internal.debug.core.xdebug.dbgp.session,
org.eclipse.ui.browser,
org.eclipse.core.resources,
org.eclipse.php.debug.core.debugger.pathmapper,
org.eclipse.php.internal.debug.core.model,
org.eclipse.php.internal.debug.core.xdebug.dbgp,
org2.eclipse.php.debug.core.debugger.pathmapper,
org2.eclipse.php.internal.debug.core.model,
org2.eclipse.php.internal.debug.core.xdebug.dbgp,
org.w3c.dom,
org.eclipse.debug.core.model",
org.eclipse.php.internal.debug.core.xdebug.dbgp.protocol;uses:="org.w3c.dom",
org.eclipse.php.internal.debug.core.xdebug.dbgp.session;uses:="org.eclipse.php.internal.debug.core.xdebug.dbgp.model,org.eclipse.php.internal.debug.core.xdebug.dbgp.protocol",
org.eclipse.php.internal.debug.core.zend.communication;
org2.eclipse.php.internal.debug.core.xdebug.dbgp.protocol;uses:="org.w3c.dom",
org2.eclipse.php.internal.debug.core.xdebug.dbgp.session;uses:="org2.eclipse.php.internal.debug.core.xdebug.dbgp.model,org2.eclipse.php.internal.debug.core.xdebug.dbgp.protocol",
org2.eclipse.php.internal.debug.core.zend.communication;
uses:="org.eclipse.debug.core,
org.eclipse.php.internal.debug.core.launching,
org.eclipse.php.internal.debug.core.daemon,
org.eclipse.php.internal.debug.core.zend.model,
org2.eclipse.php.internal.debug.core.launching,
org2.eclipse.php.internal.debug.core.daemon,
org2.eclipse.php.internal.debug.core.zend.model,
org.eclipse.debug.core.model,
org.eclipse.php.internal.debug.core.zend.debugger,
org2.eclipse.php.internal.debug.core.zend.debugger,
org.eclipse.core.resources,
org.eclipse.php.internal.debug.core.zend.debugger.messages,
org2.eclipse.php.internal.debug.core.zend.debugger.messages,
com.aptana.php.debug.core.daemon",
org.eclipse.php.internal.debug.core.zend.debugger;
org2.eclipse.php.internal.debug.core.zend.debugger;
uses:="org.eclipse.debug.core,
org.eclipse.core.runtime,
org.eclipse.php.internal.debug.core.zend.communication,
org.eclipse.php.debug.core.debugger,
org2.eclipse.php.internal.debug.core.zend.communication,
org2.eclipse.php.debug.core.debugger,
org.eclipse.swt.events,
org.eclipse.php.debug.core.debugger.handlers,
org.eclipse.php.internal.debug.core.preferences,
org.eclipse.php.internal.debug.core.zend.model,
org.eclipse.php.debug.core.debugger.messages,
org2.eclipse.php.debug.core.debugger.handlers,
org2.eclipse.php.internal.debug.core.preferences,
org2.eclipse.php.internal.debug.core.zend.model,
org2.eclipse.php.debug.core.debugger.messages,
org.eclipse.swt.widgets,
org.eclipse.php.debug.core.debugger.parameters,
org2.eclipse.php.debug.core.debugger.parameters,
org.eclipse.jface.dialogs,
org.eclipse.php.internal.debug.core.debugger",
org.eclipse.php.internal.debug.core.zend.debugger.handlers;uses:="org.eclipse.php.debug.core.debugger.handlers,org.eclipse.php.internal.debug.core.zend.model,org.eclipse.php.debug.core.debugger.messages",
org.eclipse.php.internal.debug.core.zend.debugger.messages;uses:="org.eclipse.php.internal.debug.core.zend.debugger,org.eclipse.php.debug.core.debugger.messages",
org.eclipse.php.internal.debug.core.zend.debugger.parameters;uses:="org.eclipse.debug.core,org.eclipse.php.debug.core.debugger.parameters",
org.eclipse.php.internal.debug.core.zend.model;
org2.eclipse.php.internal.debug.core.debugger",
org2.eclipse.php.internal.debug.core.zend.debugger.handlers;uses:="org2.eclipse.php.debug.core.debugger.handlers,org2.eclipse.php.internal.debug.core.zend.model,org2.eclipse.php.debug.core.debugger.messages",
org2.eclipse.php.internal.debug.core.zend.debugger.messages;uses:="org2.eclipse.php.internal.debug.core.zend.debugger,org2.eclipse.php.debug.core.debugger.messages",
org2.eclipse.php.internal.debug.core.zend.debugger.parameters;uses:="org.eclipse.debug.core,org2.eclipse.php.debug.core.debugger.parameters",
org2.eclipse.php.internal.debug.core.zend.model;
uses:="org.eclipse.debug.core,
org.eclipse.core.runtime,
org.eclipse.php.internal.debug.core.zend.debugger,
org.eclipse.php.internal.debug.core.pathmapper,
org.eclipse.php.internal.debug.core,
org.eclipse.php.internal.debug.core.zend.communication,
org2.eclipse.php.internal.debug.core.zend.debugger,
org2.eclipse.php.internal.debug.core.pathmapper,
org2.eclipse.php.internal.debug.core,
org2.eclipse.php.internal.debug.core.zend.communication,
org.eclipse.core.resources,
org.eclipse.php.internal.debug.core.model,
org2.eclipse.php.internal.debug.core.model,
org.eclipse.debug.core.model",
org.eclipse.php.internal.debug.core.zend.testConnection,
org.eclipse.php.internal.debug.ui,
org.eclipse.php.internal.debug.ui.actions,
org.eclipse.php.internal.debug.ui.breakpoint,
org.eclipse.php.internal.debug.ui.breakpoint.adapter,
org.eclipse.php.internal.debug.ui.breakpoint.property,
org.eclipse.php.internal.debug.ui.breakpoint.provider,
org.eclipse.php.internal.debug.ui.console,
org.eclipse.php.internal.debug.ui.launching,
org.eclipse.php.internal.debug.ui.launching.exe,
org.eclipse.php.internal.debug.ui.launching.server,
org.eclipse.php.internal.debug.ui.launching.server.zend,
org.eclipse.php.internal.debug.ui.model,
org.eclipse.php.internal.debug.ui.pathmapper,
org.eclipse.php.internal.debug.ui.preferences,
org.eclipse.php.internal.debug.ui.preferences.phps,
org.eclipse.php.internal.debug.ui.preferences.stepFilter,
org.eclipse.php.internal.debug.ui.presentation,
org.eclipse.php.internal.debug.ui.propertyTesters,
org.eclipse.php.internal.debug.ui.sourcelookup,
org.eclipse.php.internal.debug.ui.util,
org.eclipse.php.internal.debug.ui.views,
org.eclipse.php.internal.debug.ui.views.variables,
org.eclipse.php.internal.debug.ui.watch,
org.eclipse.php.internal.debug.ui.wizard,
org.eclipse.php.internal.debug.ui.wizard.exe,
org.eclipse.php.internal.debug.ui.wizard.web
org2.eclipse.php.internal.debug.core.zend.testConnection,
org2.eclipse.php.internal.debug.ui,
org2.eclipse.php.internal.debug.ui.actions,
org2.eclipse.php.internal.debug.ui.breakpoint,
org2.eclipse.php.internal.debug.ui.breakpoint.adapter,
org2.eclipse.php.internal.debug.ui.breakpoint.property,
org2.eclipse.php.internal.debug.ui.breakpoint.provider,
org2.eclipse.php.internal.debug.ui.console,
org2.eclipse.php.internal.debug.ui.launching,
org2.eclipse.php.internal.debug.ui.launching.exe,
org2.eclipse.php.internal.debug.ui.launching.server,
org2.eclipse.php.internal.debug.ui.launching.server.zend,
org2.eclipse.php.internal.debug.ui.model,
org2.eclipse.php.internal.debug.ui.pathmapper,
org2.eclipse.php.internal.debug.ui.preferences,
org2.eclipse.php.internal.debug.ui.preferences.phps,
org2.eclipse.php.internal.debug.ui.preferences.stepFilter,
org2.eclipse.php.internal.debug.ui.presentation,
org2.eclipse.php.internal.debug.ui.propertyTesters,
org2.eclipse.php.internal.debug.ui.sourcelookup,
org2.eclipse.php.internal.debug.ui.util,
org2.eclipse.php.internal.debug.ui.views,
org2.eclipse.php.internal.debug.ui.views.variables,
org2.eclipse.php.internal.debug.ui.watch,
org2.eclipse.php.internal.debug.ui.wizard,
org2.eclipse.php.internal.debug.ui.wizard.exe,
org2.eclipse.php.internal.debug.ui.wizard.web
8 ...hp/debug/core/debugger/IDebugHandler.java → ...hp/debug/core/debugger/IDebugHandler.java
View file
@@ -8,11 +8,11 @@
* Contributors:
* Zend and IBM - Initial implementation
*******************************************************************************/
package org.eclipse.php.debug.core.debugger;
package org2.eclipse.php.debug.core.debugger;

import org.eclipse.php.internal.debug.core.zend.debugger.DebugError;
import org.eclipse.php.internal.debug.core.zend.debugger.IRemoteDebugger;
import org.eclipse.php.internal.debug.core.zend.model.PHPDebugTarget;
import org2.eclipse.php.internal.debug.core.zend.debugger.DebugError;
import org2.eclipse.php.internal.debug.core.zend.debugger.IRemoteDebugger;
import org2.eclipse.php.internal.debug.core.zend.model.PHPDebugTarget;

public interface IDebugHandler {

6 ...bugger/handlers/IDebugMessageHandler.java → ...bugger/handlers/IDebugMessageHandler.java
View file
@@ -8,10 +8,10 @@
* Contributors:
* Zend and IBM - Initial implementation
*******************************************************************************/
package org.eclipse.php.debug.core.debugger.handlers;
package org2.eclipse.php.debug.core.debugger.handlers;

import org.eclipse.php.debug.core.debugger.messages.IDebugMessage;
import org.eclipse.php.internal.debug.core.zend.model.PHPDebugTarget;
import org2.eclipse.php.debug.core.debugger.messages.IDebugMessage;
import org2.eclipse.php.internal.debug.core.zend.model.PHPDebugTarget;

public interface IDebugMessageHandler {
/**
4 ...bugger/handlers/IDebugRequestHandler.java → ...bugger/handlers/IDebugRequestHandler.java
View file
@@ -8,9 +8,9 @@
* Contributors:
* Zend and IBM - Initial implementation
*******************************************************************************/
package org.eclipse.php.debug.core.debugger.handlers;
package org2.eclipse.php.debug.core.debugger.handlers;

import org.eclipse.php.debug.core.debugger.messages.IDebugResponseMessage;
import org2.eclipse.php.debug.core.debugger.messages.IDebugResponseMessage;

public interface IDebugRequestHandler extends IDebugMessageHandler {

2 ...core/debugger/messages/IDebugMessage.java → ...core/debugger/messages/IDebugMessage.java
View file
@@ -8,7 +8,7 @@
* Contributors:
* Zend and IBM - Initial implementation
*******************************************************************************/
package org.eclipse.php.debug.core.debugger.messages;
package org2.eclipse.php.debug.core.debugger.messages;

import java.io.DataInputStream;
import java.io.DataOutputStream;
2 ...r/messages/IDebugNotificationMessage.java → ...r/messages/IDebugNotificationMessage.java
View file
@@ -8,7 +8,7 @@
* Contributors:
* Zend and IBM - Initial implementation
*******************************************************************************/
package org.eclipse.php.debug.core.debugger.messages;
package org2.eclipse.php.debug.core.debugger.messages;

public interface IDebugNotificationMessage extends IDebugMessage {

2 ...bugger/messages/IDebugRequestMessage.java → ...bugger/messages/IDebugRequestMessage.java
View file
@@ -8,7 +8,7 @@
* Contributors:
* Zend and IBM - Initial implementation
*******************************************************************************/
package org.eclipse.php.debug.core.debugger.messages;
package org2.eclipse.php.debug.core.debugger.messages;

public interface IDebugRequestMessage extends IDebugMessage {

2 ...ugger/messages/IDebugResponseMessage.java → ...ugger/messages/IDebugResponseMessage.java
View file
@@ -8,7 +8,7 @@
* Contributors:
* Zend and IBM - Initial implementation
*******************************************************************************/
package org.eclipse.php.debug.core.debugger.messages;
package org2.eclipse.php.debug.core.debugger.messages;

public interface IDebugResponseMessage extends IDebugMessage {

2 ...rameters/IDebugParametersInitializer.java → ...rameters/IDebugParametersInitializer.java
View file
@@ -8,7 +8,7 @@
* Contributors:
* Zend and IBM - Initial implementation
*******************************************************************************/
package org.eclipse.php.debug.core.debugger.parameters;
package org2.eclipse.php.debug.core.debugger.parameters;

import java.net.URL;
import java.util.Hashtable;
2 ...gger/parameters/IDebugParametersKeys.java → ...gger/parameters/IDebugParametersKeys.java
View file
@@ -8,7 +8,7 @@
* Contributors:
* Zend and IBM - Initial implementation
*******************************************************************************/
package org.eclipse.php.debug.core.debugger.parameters;
package org2.eclipse.php.debug.core.debugger.parameters;

/**
* An interface that holds the debug parameters keys.
2 ...eters/IWebDebugParametersInitializer.java → ...eters/IWebDebugParametersInitializer.java
View file
@@ -8,7 +8,7 @@
* Contributors:
* Zend and IBM - Initial implementation
*******************************************************************************/
package org.eclipse.php.debug.core.debugger.parameters;
package org2.eclipse.php.debug.core.debugger.parameters;

import java.util.Hashtable;

11 .../core/debugger/pathmapper/PathMapper.java → .../core/debugger/pathmapper/PathMapper.java
View file
@@ -8,7 +8,7 @@
* Contributors:
* Zend and IBM - Initial implementation
*******************************************************************************/
package org.eclipse.php.debug.core.debugger.pathmapper;
package org2.eclipse.php.debug.core.debugger.pathmapper;

import java.io.File;
import java.util.ArrayList;
@@ -21,10 +21,11 @@

import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.php.internal.core.util.preferences.IXMLPreferencesStorable;
import org.eclipse.php.internal.debug.core.pathmapper.PathEntry;
import org.eclipse.php.internal.debug.core.pathmapper.PathEntry.Type;
import org.eclipse.php.internal.debug.core.pathmapper.VirtualPath;

import org2.eclipse.php.internal.core.util.preferences.IXMLPreferencesStorable;
import org2.eclipse.php.internal.debug.core.pathmapper.PathEntry;
import org2.eclipse.php.internal.debug.core.pathmapper.PathEntry.Type;
import org2.eclipse.php.internal.debug.core.pathmapper.VirtualPath;

public class PathMapper implements IXMLPreferencesStorable {

2 ...php/internal/core/util/BlockingQueue.java → ...php/internal/core/util/BlockingQueue.java
View file
@@ -8,7 +8,7 @@
* Contributors:
* Zend and IBM - Initial implementation
*******************************************************************************/
package org.eclipse.php.internal.core.util;
package org2.eclipse.php.internal.core.util;

import java.util.ArrayList;

2 ...ernal/core/util/ElementCreationProxy.java → ...ernal/core/util/ElementCreationProxy.java
View file
@@ -8,7 +8,7 @@
* Contributors:
* Zend and IBM - Initial implementation
*******************************************************************************/
package org.eclipse.php.internal.core.util;
package org2.eclipse.php.internal.core.util;

import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.SafeRunner;
2 ...pse/php/internal/core/util/FileUtils.java → ...pse/php/internal/core/util/FileUtils.java
View file
@@ -8,7 +8,7 @@
* Contributors:
* Zend and IBM - Initial implementation
*******************************************************************************/
package org.eclipse.php.internal.core.util;
package org2.eclipse.php.internal.core.util;

import java.io.BufferedReader;
import java.io.BufferedWriter;
8 ...p/internal/core/util/PHPSearchEngine.java → ...p/internal/core/util/PHPSearchEngine.java
View file
@@ -8,7 +8,7 @@
* Contributors:
* Zend and IBM - Initial implementation
*******************************************************************************/
package org.eclipse.php.internal.core.util;
package org2.eclipse.php.internal.core.util;

import java.io.File;
import java.util.HashSet;
@@ -22,9 +22,9 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
import org.eclipse.php.internal.core.project.IIncludePathEntry;
import org.eclipse.php.internal.core.project.options.PHPProjectOptions;
import org.eclipse.php.internal.core.project.options.includepath.IncludePathVariableManager;
import org2.eclipse.php.internal.core.project.IIncludePathEntry;
import org2.eclipse.php.internal.core.project.options.PHPProjectOptions;
import org2.eclipse.php.internal.core.project.options.includepath.IncludePathVariableManager;

/**
* This utility implements internal PHP mechanism for searching included files.
4 ...p/internal/debug/core/HostsCollector.java → ...p/internal/debug/core/HostsCollector.java
View file
@@ -8,15 +8,15 @@
* Contributors:
* Zend and IBM - Initial implementation
*******************************************************************************/
package org.eclipse.php.internal.debug.core;
package org2.eclipse.php.internal.debug.core;

import java.net.Inet6Address;
import java.net.InetAddress;
import java.net.NetworkInterface;
import java.util.ArrayList;
import java.util.Enumeration;

import org.eclipse.php.internal.debug.core.preferences.PHPDebugCorePreferenceNames;
import org2.eclipse.php.internal.debug.core.preferences.PHPDebugCorePreferenceNames;

import com.aptana.core.util.StringUtil;
import com.aptana.php.debug.core.preferences.PHPDebugPreferencesUtil;
8 .../debug/core/IPHPConsoleEventListener.java → .../debug/core/IPHPConsoleEventListener.java
View file
@@ -8,12 +8,12 @@
* Contributors:
* Zend and IBM - Initial implementation
*******************************************************************************/
package org.eclipse.php.internal.debug.core;
package org2.eclipse.php.internal.debug.core;

import org.eclipse.debug.core.ILaunch;
import org.eclipse.php.internal.debug.core.launching.DebugConsoleMonitor;
import org.eclipse.php.internal.debug.core.launching.PHPHyperLink;
import org.eclipse.php.internal.debug.core.zend.debugger.DebugError;
import org2.eclipse.php.internal.debug.core.launching.DebugConsoleMonitor;
import org2.eclipse.php.internal.debug.core.launching.PHPHyperLink;
import org2.eclipse.php.internal.debug.core.zend.debugger.DebugError;

public interface IPHPConsoleEventListener {

8 ...ternal/debug/core/IPHPDebugConstants.java → ...ternal/debug/core/IPHPDebugConstants.java
View file
@@ -8,7 +8,7 @@
* Contributors:
* Zend and IBM - Initial implementation
*******************************************************************************/
package org.eclipse.php.internal.debug.core;
package org2.eclipse.php.internal.debug.core;



@@ -32,7 +32,7 @@ public interface IPHPDebugConstants {
/**
* Unique identifier for the PHP debug model
*/
public static final String ID_PHP_DEBUG_CORE = "org.eclipse.php.debug.core";
public static final String ID_PHP_DEBUG_CORE = "org2.eclipse.php.debug.core";

public static final String PHP_Port = ID_PHP_DEBUG_CORE + ".PHP_Port";
public static final String PHP_URL = ID_PHP_DEBUG_CORE + ".PHP_URL";
@@ -92,8 +92,8 @@ public interface IPHPDebugConstants {

public static final String DEBUG_PER_PROJECT = ID_PHP_DEBUG_CORE + ".use-project-settings"; //$NON-NLS-1$
public static final String DEBUG_QUALIFIER = ID_PHP_DEBUG_CORE + ".Debug_Process_Preferences"; //$NON-NLS-1$
public static final String PREFERENCE_PAGE_ID = "org.eclipse.php.debug.ui.preferences.PhpDebugPreferencePage";
public static final String PROJECT_PAGE_ID = "org.eclipse.php.debug.ui.property.PhpDebugPreferencePage"; //$NON-NLS-1$
public static final String PREFERENCE_PAGE_ID = "org2.eclipse.php.debug.ui.preferences.PhpDebugPreferencePage";
public static final String PROJECT_PAGE_ID = "org2.eclipse.php.debug.ui.property.PhpDebugPreferencePage"; //$NON-NLS-1$

public static final String DEBUGGING_PAGES = "debugPages"; //$NON-NLS-1$
public static final String DEBUGGING_ALL_PAGES = "debugAllPages"; //$NON-NLS-1$
2 ...lipse/php/internal/debug/core/Logger.java → ...lipse/php/internal/debug/core/Logger.java
View file
@@ -8,7 +8,7 @@
* Contributors:
* Zend and IBM - Initial implementation
*******************************************************************************/
package org.eclipse.php.internal.debug.core;
package org2.eclipse.php.internal.debug.core;

import java.util.StringTokenizer;

4 ...rnal/debug/core/PHPDebugCoreMessages.java → ...rnal/debug/core/PHPDebugCoreMessages.java
View file
@@ -8,7 +8,7 @@
* Contributors:
* Zend and IBM - Initial implementation
*******************************************************************************/
package org.eclipse.php.internal.debug.core;
package org2.eclipse.php.internal.debug.core;

import org.eclipse.osgi.util.NLS;

@@ -17,7 +17,7 @@
*
*/
public class PHPDebugCoreMessages extends NLS {
private static final String BUNDLE_NAME = "org.eclipse.php.internal.debug.core.PHPDebugCoreMessages";//$NON-NLS-1$
private static final String BUNDLE_NAME = "org2.eclipse.php.internal.debug.core.PHPDebugCoreMessages";//$NON-NLS-1$

public static String LineBreakPointMessage_1;
public static String ConditionalBreakPointMessage_1;
0 ...ebug/core/PHPDebugCoreMessages.properties → ...ebug/core/PHPDebugCoreMessages.properties
View file
File renamed without changes.
14 .../AbstractDebuggerCommunicationDaemon.java → .../AbstractDebuggerCommunicationDaemon.java
View file
@@ -8,7 +8,7 @@
* Contributors:
* Zend and IBM - Initial implementation
*******************************************************************************/
package org.eclipse.php.internal.debug.core.daemon;
package org2.eclipse.php.internal.debug.core.daemon;

import java.io.IOException;
import java.net.BindException;
@@ -19,11 +19,11 @@
import java.text.MessageFormat;

import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.php.internal.debug.core.Logger;
import org.eclipse.php.internal.debug.core.PHPDebugCoreMessages;
import org.eclipse.php.internal.debug.core.debugger.AbstractDebuggerConfiguration;
import org.eclipse.php.internal.debug.core.preferences.PHPDebuggersRegistry;
import org.eclipse.swt.widgets.Display;
import org2.eclipse.php.internal.debug.core.Logger;
import org2.eclipse.php.internal.debug.core.PHPDebugCoreMessages;
import org2.eclipse.php.internal.debug.core.debugger.AbstractDebuggerConfiguration;
import org2.eclipse.php.internal.debug.core.preferences.PHPDebuggersRegistry;

import com.aptana.php.debug.core.daemon.ICommunicationDaemon;

@@ -175,7 +175,7 @@ public boolean resetSocket() {

/*
* (non-Javadoc)
* @see org.eclipse.php.debug.daemon.communication.ICommunicationDaemon#handleMultipleBindingError()
* @see org2.eclipse.php.debug.daemon.communication.ICommunicationDaemon#handleMultipleBindingError()
*/
public void handleMultipleBindingError() {
final int port = getReceiverPort();
@@ -256,7 +256,7 @@ public void run() {
}

/* (non-Javadoc)
* @see org.eclipse.php.internal.debug.daemon.communication.ICommunicationDaemon#isEnabled()
* @see org2.eclipse.php.internal.debug.daemon.communication.ICommunicationDaemon#isEnabled()
*/
public boolean isEnabled() {
return true;
8 ...bugger/AbstractDebuggerConfiguration.java → ...bugger/AbstractDebuggerConfiguration.java
View file
@@ -11,7 +11,7 @@
/**
*
*/
package org.eclipse.php.internal.debug.core.debugger;
package org2.eclipse.php.internal.debug.core.debugger;

import java.util.HashMap;

@@ -73,7 +73,7 @@ public void setAttribute(String id, String value)
}

/* (non-Javadoc)
* @see org.eclipse.php.internal.debug.core.debugger.IDebuggerConfiguration#getAttribute(java.lang.String)
* @see org2.eclipse.php.internal.debug.core.debugger.IDebuggerConfiguration#getAttribute(java.lang.String)
*/
public String getAttribute(String id) {
String attribute = attributes.get(id);
@@ -93,7 +93,7 @@ public void setDebuggerId(String id) {
}

/* (non-Javadoc)
* @see org.eclipse.php.internal.debug.core.debugger.IDebuggerConfiguration#getDebuggerId()
* @see org2.eclipse.php.internal.debug.core.debugger.IDebuggerConfiguration#getDebuggerId()
*/
public String getDebuggerId() {
return getAttribute(DEBUGGER_ID);
@@ -109,7 +109,7 @@ public void setName(String name) {
}

/* (non-Javadoc)
* @see org.eclipse.php.internal.debug.core.debugger.IDebuggerConfiguration#getName()
* @see org2.eclipse.php.internal.debug.core.debugger.IDebuggerConfiguration#getName()
*/
public String getName() {
return getAttribute(DEBUGGER_NAME);
2 ...core/debugger/IDebuggerConfiguration.java → ...core/debugger/IDebuggerConfiguration.java
View file
@@ -11,7 +11,7 @@
/**
*
*/
package org.eclipse.php.internal.debug.core.debugger;
package org2.eclipse.php.internal.debug.core.debugger;

import org.eclipse.swt.widgets.Shell;

2 ...e/interpreter/phpIni/INIFileModifier.java → ...e/interpreter/phpIni/INIFileModifier.java
View file
@@ -8,7 +8,7 @@
* Contributors:
* Zend and IBM - Initial implementation
*******************************************************************************/
package org.eclipse.php.internal.debug.core.interpreter.phpIni;
package org2.eclipse.php.internal.debug.core.interpreter.phpIni;

import java.io.BufferedReader;
import java.io.File;
11 ...nterpreter/phpIni/PHPINIDebuggerUtil.java → ...nterpreter/phpIni/PHPINIDebuggerUtil.java
View file
@@ -1,5 +1,5 @@

package org.eclipse.php.internal.debug.core.interpreter.phpIni;
package org2.eclipse.php.internal.debug.core.interpreter.phpIni;

import java.io.File;
import java.io.IOException;
@@ -11,10 +11,11 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Platform;
import org.eclipse.php.internal.core.project.IIncludePathEntry;
import org.eclipse.php.internal.core.project.options.includepath.IncludePathVariableManager;
import org.eclipse.php.internal.core.util.PHPSearchEngine;
import org.eclipse.php.internal.debug.core.preferences.PHPexes;

import org2.eclipse.php.internal.core.project.IIncludePathEntry;
import org2.eclipse.php.internal.core.project.options.includepath.IncludePathVariableManager;
import org2.eclipse.php.internal.core.util.PHPSearchEngine;
import org2.eclipse.php.internal.debug.core.preferences.PHPexes;

import com.aptana.php.debug.core.includepath.PHPIncludePathUtils;
import com.aptana.php.debug.epl.PHPDebugEPLPlugin;
2 ...g/core/interpreter/phpIni/PHPINIUtil.java → ...g/core/interpreter/phpIni/PHPINIUtil.java
View file
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
package org.eclipse.php.internal.debug.core.interpreter.phpIni;
package org2.eclipse.php.internal.debug.core.interpreter.phpIni;

import java.io.BufferedReader;
import java.io.File;
2 ...eter/preferences/DependenciesManager.java → ...eter/preferences/DependenciesManager.java
View file
@@ -32,7 +32,7 @@
*
* Any modifications to this file must keep this entire header intact.
*/
package org.eclipse.php.internal.debug.core.interpreter.preferences;
package org2.eclipse.php.internal.debug.core.interpreter.preferences;

import java.io.File;
import java.util.ArrayList;
4 ...e/interpreter/preferences/PHPexeItem.java → ...e/interpreter/preferences/PHPexeItem.java
View file
@@ -8,7 +8,7 @@
* Contributors:
* Zend and IBM - Initial implementation
*******************************************************************************/
package org.eclipse.php.internal.debug.core.interpreter.preferences;
package org2.eclipse.php.internal.debug.core.interpreter.preferences;

import java.io.BufferedReader;
import java.io.File;
@@ -19,7 +19,7 @@
import java.util.regex.Pattern;

import org.eclipse.core.runtime.Platform;
import org.eclipse.php.internal.debug.core.interpreter.phpIni.PHPINIUtil;
import org2.eclipse.php.internal.debug.core.interpreter.phpIni.PHPINIUtil;

import com.aptana.php.debug.core.interpreter.IInterpreter;
import com.aptana.php.debug.core.util.FileUtils;
2 ...g/core/launching/DebugConsoleMonitor.java → ...g/core/launching/DebugConsoleMonitor.java
View file
@@ -8,7 +8,7 @@
* Contributors:
* Zend and IBM - Initial implementation
*******************************************************************************/
package org.eclipse.php.internal.debug.core.launching;
package org2.eclipse.php.internal.debug.core.launching;

import java.util.Enumeration;
import java.util.Vector;
2 ...re/launching/DebugSessionIdGenerator.java → ...re/launching/DebugSessionIdGenerator.java
View file
@@ -8,7 +8,7 @@
* Contributors:
* Zend and IBM - Initial implementation
*******************************************************************************/
package org.eclipse.php.internal.debug.core.launching;
package org2.eclipse.php.internal.debug.core.launching;

/**
* Thread safe debug session id generator.
2 .../debug/core/launching/HyperlinkEntry.java → .../debug/core/launching/HyperlinkEntry.java
View file
@@ -8,7 +8,7 @@
* Contributors:
* Zend and IBM - Initial implementation
*******************************************************************************/
package org.eclipse.php.internal.debug.core.launching;
package org2.eclipse.php.internal.debug.core.launching;

import org.eclipse.ui.console.IHyperlink;

32 ...aunching/PHPExecutableLaunchDelegate.java → ...aunching/PHPExecutableLaunchDelegate.java
View file
@@ -8,7 +8,7 @@
* Contributors:
* Zend and IBM - Initial implementation
*******************************************************************************/
package org.eclipse.php.internal.debug.core.launching;
package org2.eclipse.php.internal.debug.core.launching;

import java.io.File;
import java.text.MessageFormat;
@@ -37,22 +37,22 @@
import org.eclipse.debug.ui.CommonTab;
import org.eclipse.debug.ui.RefreshTab;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.php.debug.core.debugger.parameters.IDebugParametersInitializer;
import org.eclipse.php.debug.core.debugger.parameters.IDebugParametersKeys;
import org.eclipse.php.internal.debug.core.IPHPDebugConstants;
import org.eclipse.php.internal.debug.core.Logger;
import org.eclipse.php.internal.debug.core.PHPDebugCoreMessages;
import org.eclipse.php.internal.debug.core.interpreter.phpIni.PHPINIDebuggerUtil;
import org.eclipse.php.internal.debug.core.interpreter.phpIni.PHPINIUtil;
import org.eclipse.php.internal.debug.core.interpreter.preferences.PHPexeItem;
import org.eclipse.php.internal.debug.core.preferences.PHPProjectPreferences;
import org.eclipse.php.internal.debug.core.preferences.PHPexes;
import org.eclipse.php.internal.debug.core.zend.communication.DebuggerCommunicationDaemon;
import org.eclipse.php.internal.debug.core.zend.debugger.DebugParametersInitializersRegistry;
import org.eclipse.php.internal.debug.core.zend.debugger.PHPExecutableDebuggerInitializer;
import org.eclipse.php.internal.debug.core.zend.debugger.PHPSessionLaunchMapper;
import org.eclipse.php.internal.debug.core.zend.debugger.ProcessCrashDetector;
import org.eclipse.swt.widgets.Display;
import org2.eclipse.php.debug.core.debugger.parameters.IDebugParametersInitializer;
import org2.eclipse.php.debug.core.debugger.parameters.IDebugParametersKeys;
import org2.eclipse.php.internal.debug.core.IPHPDebugConstants;
import org2.eclipse.php.internal.debug.core.Logger;
import org2.eclipse.php.internal.debug.core.PHPDebugCoreMessages;
import org2.eclipse.php.internal.debug.core.interpreter.phpIni.PHPINIDebuggerUtil;
import org2.eclipse.php.internal.debug.core.interpreter.phpIni.PHPINIUtil;
import org2.eclipse.php.internal.debug.core.interpreter.preferences.PHPexeItem;
import org2.eclipse.php.internal.debug.core.preferences.PHPProjectPreferences;
import org2.eclipse.php.internal.debug.core.preferences.PHPexes;
import org2.eclipse.php.internal.debug.core.zend.communication.DebuggerCommunicationDaemon;
import org2.eclipse.php.internal.debug.core.zend.debugger.DebugParametersInitializersRegistry;
import org2.eclipse.php.internal.debug.core.zend.debugger.PHPExecutableDebuggerInitializer;
import org2.eclipse.php.internal.debug.core.zend.debugger.PHPSessionLaunchMapper;
import org2.eclipse.php.internal.debug.core.zend.debugger.ProcessCrashDetector;

import com.aptana.php.debug.core.IPHPDebugCorePreferenceKeys;
import com.aptana.php.debug.core.daemon.DebugDaemon;
2 ...al/debug/core/launching/PHPHyperLink.java → ...al/debug/core/launching/PHPHyperLink.java
View file
@@ -8,7 +8,7 @@
* Contributors:
* Zend and IBM - Initial implementation
*******************************************************************************/
package org.eclipse.php.internal.debug.core.launching;
package org2.eclipse.php.internal.debug.core.launching;

import java.util.List;
import java.util.Vector;
2 ...ernal/debug/core/launching/PHPLaunch.java → ...ernal/debug/core/launching/PHPLaunch.java
View file
@@ -11,7 +11,7 @@
/**
*
*/
package org.eclipse.php.internal.debug.core.launching;
package org2.eclipse.php.internal.debug.core.launching;

import java.util.ArrayList;
import java.util.Iterator;
4 ...ore/launching/PHPLaunchDelegateProxy.java → ...ore/launching/PHPLaunchDelegateProxy.java
View file
@@ -11,7 +11,7 @@
/**
*
*/
package org.eclipse.php.internal.debug.core.launching;
package org2.eclipse.php.internal.debug.core.launching;

import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -77,7 +77,7 @@ public void launch(ILaunchConfiguration configuration, String mode, ILaunch laun
* Create and return a launch configuration delegate.
* In case the delegate was already created, return the cached delegate.
* Note that in order to allow class instanciation from non-dependent plug-in, there is a need to
* define the plug-in as Eclipse-RegisterBuddy: org.eclipse.php.debug.core
* define the plug-in as Eclipse-RegisterBuddy: org2.eclipse.php.debug.core
*
* @param configuration An {@link ILaunchConfiguration}
*/
24 ...ug/core/launching/PHPLaunchUtilities.java → ...ug/core/launching/PHPLaunchUtilities.java
View file
@@ -8,7 +8,7 @@
* Contributors:
* Zend and IBM - Initial implementation
*******************************************************************************/
package org.eclipse.php.internal.debug.core.launching;
package org2.eclipse.php.internal.debug.core.launching;

import java.io.File;
import java.io.UnsupportedEncodingException;
@@ -54,17 +54,6 @@
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.window.Window;
import org.eclipse.osgi.util.NLS;
import org.eclipse.php.debug.core.debugger.parameters.IDebugParametersInitializer;
import org.eclipse.php.debug.core.debugger.parameters.IDebugParametersKeys;
import org.eclipse.php.internal.debug.core.IPHPDebugConstants;
import org.eclipse.php.internal.debug.core.Logger;
import org.eclipse.php.internal.debug.core.PHPDebugCoreMessages;
import org.eclipse.php.internal.debug.core.debugger.AbstractDebuggerConfiguration;
import org.eclipse.php.internal.debug.core.preferences.PHPDebuggersRegistry;
import org.eclipse.php.internal.debug.core.xdebug.communication.XDebugCommunicationDaemon;
import org.eclipse.php.internal.debug.core.zend.communication.DebugConnectionThread;
import org.eclipse.php.internal.debug.core.zend.communication.DebuggerCommunicationDaemon;
import org.eclipse.php.internal.debug.core.zend.model.PHPDebugTarget;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Cursor;
import org.eclipse.swt.graphics.Image;
@@ -86,6 +75,17 @@
import org.eclipse.ui.browser.IWorkbenchBrowserSupport;
import org.eclipse.ui.internal.browser.WebBrowserPreference;
import org.eclipse.ui.internal.browser.WebBrowserView;
import org2.eclipse.php.debug.core.debugger.parameters.IDebugParametersInitializer;
import org2.eclipse.php.debug.core.debugger.parameters.IDebugParametersKeys;
import org2.eclipse.php.internal.debug.core.IPHPDebugConstants;
import org2.eclipse.php.internal.debug.core.Logger;
import org2.eclipse.php.internal.debug.core.PHPDebugCoreMessages;
import org2.eclipse.php.internal.debug.core.debugger.AbstractDebuggerConfiguration;
import org2.eclipse.php.internal.debug.core.preferences.PHPDebuggersRegistry;
import org2.eclipse.php.internal.debug.core.xdebug.communication.XDebugCommunicationDaemon;
import org2.eclipse.php.internal.debug.core.zend.communication.DebugConnectionThread;
import org2.eclipse.php.internal.debug.core.zend.communication.DebuggerCommunicationDaemon;
import org2.eclipse.php.internal.debug.core.zend.model.PHPDebugTarget;

import com.aptana.php.debug.core.IPHPDebugCorePreferenceKeys;
import com.aptana.php.debug.core.launch.DebugPortNotificationDialog;
2 ...rnal/debug/core/launching/PHPProcess.java → ...rnal/debug/core/launching/PHPProcess.java
View file
@@ -8,7 +8,7 @@
* Contributors:
* Zend and IBM - Initial implementation
*******************************************************************************/
package org.eclipse.php.internal.debug.core.launching;
package org2.eclipse.php.internal.debug.core.launching;

import java.util.HashMap;
import java.util.Map;
2 ...debug/core/launching/PHPStreamsProxy.java → ...debug/core/launching/PHPStreamsProxy.java
View file
@@ -8,7 +8,7 @@
* Contributors:
* Zend and IBM - Initial implementation
*******************************************************************************/
package org.eclipse.php.internal.debug.core.launching;
package org2.eclipse.php.internal.debug.core.launching;

import org.eclipse.debug.core.model.IStreamMonitor;
import org.eclipse.debug.core.model.IStreamsProxy;
22 ...e/launching/PHPWebPageLaunchDelegate.java → ...e/launching/PHPWebPageLaunchDelegate.java
View file
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
package org.eclipse.php.internal.debug.core.launching;
package org2.eclipse.php.internal.debug.core.launching;

import java.text.MessageFormat;

@@ -37,16 +37,16 @@
import org.eclipse.debug.core.model.IThread;
import org.eclipse.debug.core.model.LaunchConfigurationDelegate;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.php.debug.core.debugger.parameters.IDebugParametersKeys;
import org.eclipse.php.internal.debug.core.IPHPDebugConstants;
import org.eclipse.php.internal.debug.core.Logger;
import org.eclipse.php.internal.debug.core.PHPDebugCoreMessages;
import org.eclipse.php.internal.debug.core.preferences.PHPProjectPreferences;
import org.eclipse.php.internal.debug.core.zend.communication.DebuggerCommunicationDaemon;
import org.eclipse.php.internal.debug.core.zend.debugger.IDebuggerInitializer;
import org.eclipse.php.internal.debug.core.zend.debugger.PHPSessionLaunchMapper;
import org.eclipse.php.internal.debug.core.zend.debugger.PHPWebServerDebuggerInitializer;
import org.eclipse.swt.widgets.Display;
import org2.eclipse.php.debug.core.debugger.parameters.IDebugParametersKeys;
import org2.eclipse.php.internal.debug.core.IPHPDebugConstants;
import org2.eclipse.php.internal.debug.core.Logger;
import org2.eclipse.php.internal.debug.core.PHPDebugCoreMessages;
import org2.eclipse.php.internal.debug.core.preferences.PHPProjectPreferences;
import org2.eclipse.php.internal.debug.core.zend.communication.DebuggerCommunicationDaemon;
import org2.eclipse.php.internal.debug.core.zend.debugger.IDebuggerInitializer;
import org2.eclipse.php.internal.debug.core.zend.debugger.PHPSessionLaunchMapper;
import org2.eclipse.php.internal.debug.core.zend.debugger.PHPWebServerDebuggerInitializer;

import com.aptana.php.debug.core.IPHPDebugCorePreferenceKeys;
import com.aptana.php.debug.core.daemon.DebugDaemon;
@@ -81,7 +81,7 @@ public ILaunch getLaunch(ILaunchConfiguration configuration, String mode) throws

/*
* (non-Javadoc)
* @see org.eclipse.php.internal.server.core.launch.IHTTPServerLaunch#launch(org.eclipse.debug.core.ILaunchConfiguration, java.lang.String, org.eclipse.debug.core.ILaunch, org.eclipse.core.runtime.IProgressMonitor)
* @see org2.eclipse.php.internal.server.core.launch.IHTTPServerLaunch#launch(org.eclipse.debug.core.ILaunchConfiguration, java.lang.String, org.eclipse.debug.core.ILaunch, org.eclipse.core.runtime.IProgressMonitor)
*/
public void launch(ILaunchConfiguration configuration, String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException {
// Check that the debug daemon is functional
42 ...XDebugExeLaunchConfigurationDelegate.java → ...XDebugExeLaunchConfigurationDelegate.java
View file
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial implementation
*******************************************************************************/
package org.eclipse.php.internal.debug.core.launching;
package org2.eclipse.php.internal.debug.core.launching;

import java.io.File;
import java.io.FileInputStream;
@@ -39,34 +39,34 @@
import org.eclipse.jface.dialogs.ErrorDialog;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.preference.PreferenceDialog;
import org.eclipse.php.debug.core.debugger.parameters.IDebugParametersKeys;
import org.eclipse.php.internal.debug.core.IPHPDebugConstants;
import org.eclipse.php.internal.debug.core.Logger;
import org.eclipse.php.internal.debug.core.PHPDebugCoreMessages;
import org.eclipse.php.internal.debug.core.interpreter.phpIni.PHPINIDebuggerUtil;
import org.eclipse.php.internal.debug.core.interpreter.phpIni.PHPINIUtil;
import org.eclipse.php.internal.debug.core.interpreter.preferences.PHPexeItem;
import org.eclipse.php.internal.debug.core.pathmapper.PathMapperRegistry;
import org.eclipse.php.internal.debug.core.preferences.PHPProjectPreferences;
import org.eclipse.php.internal.debug.core.preferences.PHPexes;
import org.eclipse.php.internal.debug.core.xdebug.IDELayerFactory;
import org.eclipse.php.internal.debug.core.xdebug.XDebugPreferenceMgr;
import org.eclipse.php.internal.debug.core.xdebug.dbgp.DBGpBreakpointFacade;
import org.eclipse.php.internal.debug.core.xdebug.dbgp.DBGpPreferences;
import org.eclipse.php.internal.debug.core.xdebug.dbgp.DBGpProxyHandler;
import org.eclipse.php.internal.debug.core.xdebug.dbgp.XDebugDebuggerConfiguration;
import org.eclipse.php.internal.debug.core.xdebug.dbgp.model.DBGpTarget;
import org.eclipse.php.internal.debug.core.xdebug.dbgp.session.DBGpSessionHandler;
import org.eclipse.php.internal.debug.core.zend.debugger.ProcessCrashDetector;
import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.dialogs.PreferencesUtil;
import org2.eclipse.php.debug.core.debugger.parameters.IDebugParametersKeys;
import org2.eclipse.php.internal.debug.core.IPHPDebugConstants;
import org2.eclipse.php.internal.debug.core.Logger;
import org2.eclipse.php.internal.debug.core.PHPDebugCoreMessages;
import org2.eclipse.php.internal.debug.core.interpreter.phpIni.PHPINIDebuggerUtil;
import org2.eclipse.php.internal.debug.core.interpreter.phpIni.PHPINIUtil;
import org2.eclipse.php.internal.debug.core.interpreter.preferences.PHPexeItem;
import org2.eclipse.php.internal.debug.core.pathmapper.PathMapperRegistry;
import org2.eclipse.php.internal.debug.core.preferences.PHPProjectPreferences;
import org2.eclipse.php.internal.debug.core.preferences.PHPexes;
import org2.eclipse.php.internal.debug.core.xdebug.IDELayerFactory;
import org2.eclipse.php.internal.debug.core.xdebug.XDebugPreferenceMgr;
import org2.eclipse.php.internal.debug.core.xdebug.dbgp.DBGpBreakpointFacade;
import org2.eclipse.php.internal.debug.core.xdebug.dbgp.DBGpPreferences;
import org2.eclipse.php.internal.debug.core.xdebug.dbgp.DBGpProxyHandler;
import org2.eclipse.php.internal.debug.core.xdebug.dbgp.XDebugDebuggerConfiguration;
import org2.eclipse.php.internal.debug.core.xdebug.dbgp.model.DBGpTarget;
import org2.eclipse.php.internal.debug.core.xdebug.dbgp.session.DBGpSessionHandler;
import org2.eclipse.php.internal.debug.core.zend.debugger.ProcessCrashDetector;

import com.aptana.php.debug.core.launch.ScriptLocator;
import com.aptana.php.debug.epl.PHPDebugEPLPlugin;

public class XDebugExeLaunchConfigurationDelegate extends LaunchConfigurationDelegate {

public static final String INTERPRETERS_PREF_ID = "org.eclipse.php.debug.ui.preferencesphps.PHPsPreferencePage"; //$NON-NLS-1$
public static final String INTERPRETERS_PREF_ID = "org2.eclipse.php.debug.ui.preferencesphps.PHPsPreferencePage"; //$NON-NLS-1$


public void launch(ILaunchConfiguration configuration, String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException {
10 .../core/launching/XDebugLaunchListener.java → .../core/launching/XDebugLaunchListener.java
View file
@@ -8,14 +8,14 @@
* Contributors:
* IBM Corporation - initial implementation
*******************************************************************************/
package org.eclipse.php.internal.debug.core.launching;
package org2.eclipse.php.internal.debug.core.launching;

import org.eclipse.debug.core.DebugPlugin;
import org.eclipse.debug.core.ILaunch;
import org.eclipse.debug.core.ILaunchesListener;
import org.eclipse.debug.core.model.IDebugTarget;
import org.eclipse.php.internal.debug.core.xdebug.IDELayerFactory;
import org.eclipse.php.internal.debug.core.xdebug.dbgp.model.IDBGpDebugTarget;
import org2.eclipse.php.internal.debug.core.xdebug.IDELayerFactory;
import org2.eclipse.php.internal.debug.core.xdebug.dbgp.model.IDBGpDebugTarget;

/**
* This class is responsible for mapping debug session id's to the ILaunch that is responsible for
@@ -25,7 +25,7 @@
*/
public class XDebugLaunchListener implements ILaunchesListener {

//private static final String SYSTEM_DEBUG_PROPERTY = "org.eclipse.php.debug.ui.activeDebugging";
//private static final String SYSTEM_DEBUG_PROPERTY = "org2.eclipse.php.debug.ui.activeDebugging";
private static final String SYSTEM_DEBUG_PROPERTY = IDELayerFactory.getIDELayer().getSystemDebugProperty();

private static XDebugLaunchListener instance;
@@ -68,7 +68,7 @@ public void launchesRemoved(ILaunch[] launches) {
}

/**
* Update the "org.eclipse.php.debug.ui.activeDebugging" system property.
* Update the "org2.eclipse.php.debug.ui.activeDebugging" system property.
* This method is important for any action that is defined to be visible when a debug session is
* active (such as the Run to Line action).
*
34 ...XDebugWebLaunchConfigurationDelegate.java → ...XDebugWebLaunchConfigurationDelegate.java
View file
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial implementation
*******************************************************************************/
package org.eclipse.php.internal.debug.core.launching;
package org2.eclipse.php.internal.debug.core.launching;

import java.io.UnsupportedEncodingException;
import java.net.MalformedURLException;
@@ -33,27 +33,27 @@
import org.eclipse.debug.core.ILaunchManager;
import org.eclipse.debug.core.model.LaunchConfigurationDelegate;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.php.debug.core.debugger.parameters.IDebugParametersKeys;
import org.eclipse.php.internal.debug.core.IPHPDebugConstants;
import org.eclipse.php.internal.debug.core.Logger;
import org.eclipse.php.internal.debug.core.PHPDebugCoreMessages;
import org.eclipse.php.internal.debug.core.pathmapper.PathMapperRegistry;
import org.eclipse.php.internal.debug.core.preferences.PHPProjectPreferences;
import org.eclipse.php.internal.debug.core.xdebug.IDELayerFactory;
import org.eclipse.php.internal.debug.core.xdebug.XDebugPreferenceMgr;
import org.eclipse.php.internal.debug.core.xdebug.communication.XDebugCommunicationDaemon;
import org.eclipse.php.internal.debug.core.xdebug.dbgp.DBGpBreakpointFacade;
import org.eclipse.php.internal.debug.core.xdebug.dbgp.DBGpProxyHandler;
import org.eclipse.php.internal.debug.core.xdebug.dbgp.model.DBGpMultiSessionTarget;
import org.eclipse.php.internal.debug.core.xdebug.dbgp.model.DBGpTarget;
import org.eclipse.php.internal.debug.core.xdebug.dbgp.model.IDBGpDebugTarget;
import org.eclipse.php.internal.debug.core.xdebug.dbgp.session.DBGpSessionHandler;
import org.eclipse.php.internal.debug.core.xdebug.dbgp.session.IDBGpSessionListener;
import org.eclipse.swt.browser.Browser;
import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.browser.IWebBrowser;
import org2.eclipse.php.debug.core.debugger.parameters.IDebugParametersKeys;
import org2.eclipse.php.internal.debug.core.IPHPDebugConstants;
import org2.eclipse.php.internal.debug.core.Logger;
import org2.eclipse.php.internal.debug.core.PHPDebugCoreMessages;
import org2.eclipse.php.internal.debug.core.pathmapper.PathMapperRegistry;
import org2.eclipse.php.internal.debug.core.preferences.PHPProjectPreferences;
import org2.eclipse.php.internal.debug.core.xdebug.IDELayerFactory;
import org2.eclipse.php.internal.debug.core.xdebug.XDebugPreferenceMgr;
import org2.eclipse.php.internal.debug.core.xdebug.communication.XDebugCommunicationDaemon;
import org2.eclipse.php.internal.debug.core.xdebug.dbgp.DBGpBreakpointFacade;
import org2.eclipse.php.internal.debug.core.xdebug.dbgp.DBGpProxyHandler;
import org2.eclipse.php.internal.debug.core.xdebug.dbgp.model.DBGpMultiSessionTarget;
import org2.eclipse.php.internal.debug.core.xdebug.dbgp.model.DBGpTarget;
import org2.eclipse.php.internal.debug.core.xdebug.dbgp.model.IDBGpDebugTarget;
import org2.eclipse.php.internal.debug.core.xdebug.dbgp.session.DBGpSessionHandler;
import org2.eclipse.php.internal.debug.core.xdebug.dbgp.session.IDBGpSessionListener;

import com.aptana.php.debug.core.IPHPDebugCorePreferenceKeys;
import com.aptana.php.debug.core.daemon.DebugDaemon;
9 ...ernal/debug/core/model/BreakpointSet.java → ...ernal/debug/core/model/BreakpointSet.java
View file
@@ -8,7 +8,7 @@
* Contributors:
* Zend and IBM - Initial implementation
*******************************************************************************/
package org.eclipse.php.internal.debug.core.model;
package org2.eclipse.php.internal.debug.core.model;

import java.io.File;
import java.util.ArrayList;
@@ -19,9 +19,10 @@
import org.eclipse.core.resources.IWorkspaceRoot;
import org.eclipse.core.runtime.IPath;
import org.eclipse.debug.core.model.IBreakpoint;
import org.eclipse.php.internal.core.project.IIncludePathEntry;
import org.eclipse.php.internal.core.project.options.PHPProjectOptions;
import org.eclipse.php.internal.debug.core.IPHPDebugConstants;

import org2.eclipse.php.internal.core.project.IIncludePathEntry;
import org2.eclipse.php.internal.core.project.options.PHPProjectOptions;
import org2.eclipse.php.internal.debug.core.IPHPDebugConstants;

public class BreakpointSet {

2 ...nternal/debug/core/model/DebugOutput.java → ...nternal/debug/core/model/DebugOutput.java
View file
@@ -8,7 +8,7 @@
* Contributors:
* Zend and IBM - Initial implementation
*******************************************************************************/
package org.eclipse.php.internal.debug.core.model;
package org2.eclipse.php.internal.debug.core.model;

public class DebugOutput {

2 ...nal/debug/core/model/IPHPDebugTarget.java → ...nal/debug/core/model/IPHPDebugTarget.java
View file
@@ -8,7 +8,7 @@
* Contributors:
* IBM - Initial implementation
*******************************************************************************/
package org.eclipse.php.internal.debug.core.model;
package org2.eclipse.php.internal.debug.core.model;

import org.eclipse.debug.core.model.IDebugTarget;

8 .../core/model/PHPConditionalBreakpoint.java → .../core/model/PHPConditionalBreakpoint.java
View file
@@ -8,7 +8,7 @@
* Contributors:
* Zend and IBM - Initial implementation
*******************************************************************************/
package org.eclipse.php.internal.debug.core.model;
package org2.eclipse.php.internal.debug.core.model;

import java.text.MessageFormat;
import java.util.Map;
@@ -20,8 +20,8 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.debug.core.model.IBreakpoint;
import org.eclipse.php.internal.debug.core.IPHPDebugConstants;
import org.eclipse.php.internal.debug.core.PHPDebugCoreMessages;
import org2.eclipse.php.internal.debug.core.IPHPDebugConstants;
import org2.eclipse.php.internal.debug.core.PHPDebugCoreMessages;

public class PHPConditionalBreakpoint extends PHPLineBreakpoint {

@@ -99,7 +99,7 @@ public boolean isConditionEnabled() {
}

protected void addConditionToBP() {
org.eclipse.php.internal.debug.core.zend.debugger.Breakpoint rbp = getRuntimeBreakpoint();
org2.eclipse.php.internal.debug.core.zend.debugger.Breakpoint rbp = getRuntimeBreakpoint();
if (isConditionEnabled()) {
rbp.setConditionalFlag(true);
rbp.setExpression(getCondition());
6 ...nal/debug/core/model/PHPDebugElement.java → ...nal/debug/core/model/PHPDebugElement.java
View file
@@ -8,12 +8,12 @@
* Contributors:
* Zend and IBM - Initial implementation
*******************************************************************************/
package org.eclipse.php.internal.debug.core.model;
package org2.eclipse.php.internal.debug.core.model;

import org.eclipse.debug.core.ILaunch;
import org.eclipse.debug.core.model.DebugElement;
import org.eclipse.php.internal.debug.core.IPHPDebugConstants;
import org.eclipse.php.internal.debug.core.zend.model.PHPDebugTarget;
import org2.eclipse.php.internal.debug.core.IPHPDebugConstants;
import org2.eclipse.php.internal.debug.core.zend.model.PHPDebugTarget;

/**
* Common function of PHP debug model elements
14 ...l/debug/core/model/PHPLineBreakpoint.java → ...l/debug/core/model/PHPLineBreakpoint.java
View file
@@ -8,7 +8,7 @@
* Contributors:
* Zend and IBM - Initial implementation
*******************************************************************************/
package org.eclipse.php.internal.debug.core.model;
package org2.eclipse.php.internal.debug.core.model;

import java.text.MessageFormat;

@@ -23,15 +23,15 @@
import org.eclipse.debug.core.DebugPlugin;
import org.eclipse.debug.core.model.IBreakpoint;
import org.eclipse.debug.core.model.LineBreakpoint;
import org.eclipse.php.internal.debug.core.IPHPDebugConstants;
import org.eclipse.php.internal.debug.core.PHPDebugCoreMessages;
import org2.eclipse.php.internal.debug.core.IPHPDebugConstants;
import org2.eclipse.php.internal.debug.core.PHPDebugCoreMessages;

/**
* PHP line breakpoint
*/
public class PHPLineBreakpoint extends LineBreakpoint {

protected org.eclipse.php.internal.debug.core.zend.debugger.Breakpoint fBreakpoint;
protected org2.eclipse.php.internal.debug.core.zend.debugger.Breakpoint fBreakpoint;
protected boolean fConditionChanged = false;

public PHPLineBreakpoint() {
@@ -52,7 +52,7 @@ public PHPLineBreakpoint(final IResource resource, final int lineNumber) throws

IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
public void run(IProgressMonitor monitor) throws CoreException {
IMarker marker = resource.createMarker("org.eclipse.php.debug.core.PHPConditionalBreakpointMarker");
IMarker marker = resource.createMarker("org2.eclipse.php.debug.core.PHPConditionalBreakpointMarker");
marker.setAttribute(IBreakpoint.ENABLED, Boolean.TRUE);
marker.setAttribute(IMarker.LINE_NUMBER, lineNumber);
marker.setAttribute(IBreakpoint.ID, getModelIdentifier());
@@ -93,11 +93,11 @@ protected void createRuntimeBreakpoint(IMarker marker) throws CoreException {
fileName = path.lastSegment();
}
Integer lineNumber = (Integer) marker.getAttribute(IMarker.LINE_NUMBER);
fBreakpoint = new org.eclipse.php.internal.debug.core.zend.debugger.Breakpoint(fileName, (lineNumber.intValue()));
fBreakpoint = new org2.eclipse.php.internal.debug.core.zend.debugger.Breakpoint(fileName, (lineNumber.intValue()));
fBreakpoint.setEnable(true);
}

public org.eclipse.php.internal.debug.core.zend.debugger.Breakpoint getRuntimeBreakpoint() {
public org2.eclipse.php.internal.debug.core.zend.debugger.Breakpoint getRuntimeBreakpoint() {
return fBreakpoint;
}

8 ...ug/core/model/PHPRunToLineBreakpoint.java → ...ug/core/model/PHPRunToLineBreakpoint.java
View file
@@ -8,7 +8,7 @@
* Contributors:
* Zend and IBM - Initial implementation
*******************************************************************************/
package org.eclipse.php.internal.debug.core.model;
package org2.eclipse.php.internal.debug.core.model;

import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IMarker;
@@ -19,7 +19,7 @@
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.debug.core.DebugException;
import org.eclipse.debug.core.model.IBreakpoint;
import org.eclipse.php.internal.debug.core.zend.debugger.Breakpoint;
import org2.eclipse.php.internal.debug.core.zend.debugger.Breakpoint;

/**
* A run to line breakpoint.
@@ -44,7 +44,7 @@ public void run(IProgressMonitor monitor) throws CoreException {
// associate with workspace root to avoid drawing in editor
// ruler
fSourceFile = resource;
IMarker marker = ResourcesPlugin.getWorkspace().getRoot().createMarker("org.eclipse.php.debug.core.PHPConditionalBreakpointMarker");
IMarker marker = ResourcesPlugin.getWorkspace().getRoot().createMarker("org2.eclipse.php.debug.core.PHPConditionalBreakpointMarker");
marker.setAttribute(IBreakpoint.ENABLED, Boolean.TRUE);
marker.setAttribute(IMarker.LINE_NUMBER, lineNumber);
marker.setAttribute(IBreakpoint.ID, getModelIdentifier());
@@ -62,7 +62,7 @@ protected void createRuntimeBreakpoint(IMarker marker) throws CoreException {
IPath path = file.getFullPath();
String fileName = path.lastSegment();
Integer lineNumber = (Integer) marker.getAttribute(IMarker.LINE_NUMBER);
fBreakpoint = new org.eclipse.php.internal.debug.core.zend.debugger.Breakpoint(fileName, (lineNumber.intValue()/*-1*/));
fBreakpoint = new org2.eclipse.php.internal.debug.core.zend.debugger.Breakpoint(fileName, (lineNumber.intValue()/*-1*/));
fBreakpoint.setLifeTime(Breakpoint.ZEND_ONETIME_BREAKPOINT);
}

8 .../debug/core/model/SimpleDebugHandler.java → .../debug/core/model/SimpleDebugHandler.java
View file
@@ -11,11 +11,11 @@
/**
*
*/
package org.eclipse.php.internal.debug.core.model;
package org2.eclipse.php.internal.debug.core.model;

import org.eclipse.php.debug.core.debugger.IDebugHandler;
import org.eclipse.php.internal.debug.core.Logger;
import org.eclipse.php.internal.debug.core.zend.debugger.DebugError;
import org2.eclipse.php.debug.core.debugger.IDebugHandler;
import org2.eclipse.php.internal.debug.core.Logger;
import org2.eclipse.php.internal.debug.core.zend.debugger.DebugError;

public abstract class SimpleDebugHandler implements IDebugHandler {

2 ...e/pathmapper/BestMatchPathComparator.java → ...e/pathmapper/BestMatchPathComparator.java
View file
@@ -8,7 +8,7 @@
* Contributors:
* Zend and IBM - Initial implementation
*******************************************************************************/
package org.eclipse.php.internal.debug.core.pathmapper;
package org2.eclipse.php.internal.debug.core.pathmapper;

import java.util.Comparator;

24 ...ug/core/pathmapper/DebugSearchEngine.java → ...ug/core/pathmapper/DebugSearchEngine.java
View file
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
package org.eclipse.php.internal.debug.core.pathmapper;
package org2.eclipse.php.internal.debug.core.pathmapper;

import java.io.File;
import java.io.FileFilter;
@@ -47,17 +47,6 @@
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.debug.core.model.IDebugTarget;
import org.eclipse.php.debug.core.debugger.pathmapper.PathMapper;
import org.eclipse.php.internal.core.project.IIncludePathEntry;
import org.eclipse.php.internal.core.project.options.includepath.IncludePathEntry;
import org.eclipse.php.internal.core.project.options.includepath.IncludePathVariableManager;
import org.eclipse.php.internal.core.util.PHPSearchEngine;
import org.eclipse.php.internal.core.util.PHPSearchEngine.ExternalFileResult;
import org.eclipse.php.internal.core.util.PHPSearchEngine.IncludedFileResult;
import org.eclipse.php.internal.core.util.PHPSearchEngine.ResourceResult;
import org.eclipse.php.internal.core.util.PHPSearchEngine.Result;
import org.eclipse.php.internal.debug.core.IPHPDebugConstants;
import org.eclipse.php.internal.debug.core.pathmapper.PathEntry.Type;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IEditorReference;
import org.eclipse.ui.IPathEditorInput;
@@ -66,6 +55,17 @@
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
import org2.eclipse.php.debug.core.debugger.pathmapper.PathMapper;
import org2.eclipse.php.internal.core.project.IIncludePathEntry;
import org2.eclipse.php.internal.core.project.options.includepath.IncludePathEntry;
import org2.eclipse.php.internal.core.project.options.includepath.IncludePathVariableManager;
import org2.eclipse.php.internal.core.util.PHPSearchEngine;
import org2.eclipse.php.internal.core.util.PHPSearchEngine.ExternalFileResult;
import org2.eclipse.php.internal.core.util.PHPSearchEngine.IncludedFileResult;
import org2.eclipse.php.internal.core.util.PHPSearchEngine.ResourceResult;
import org2.eclipse.php.internal.core.util.PHPSearchEngine.Result;
import org2.eclipse.php.internal.debug.core.IPHPDebugConstants;
import org2.eclipse.php.internal.debug.core.pathmapper.PathEntry.Type;

import com.aptana.editor.php.internal.core.IPHPConstants;
import com.aptana.php.debug.epl.PHPDebugEPLPlugin;
2 ...bug/core/pathmapper/IPathEntryFilter.java → ...bug/core/pathmapper/IPathEntryFilter.java
View file
@@ -8,7 +8,7 @@
* Contributors:
* Zend and IBM - Initial implementation
*******************************************************************************/
package org.eclipse.php.internal.debug.core.pathmapper;
package org2.eclipse.php.internal.debug.core.pathmapper;

import org.eclipse.debug.core.model.IDebugTarget;

4 ...rnal/debug/core/pathmapper/PathEntry.java → ...rnal/debug/core/pathmapper/PathEntry.java
View file
@@ -8,9 +8,9 @@
* Contributors:
* Zend and IBM - Initial implementation
*******************************************************************************/
package org.eclipse.php.internal.debug.core.pathmapper;
package org2.eclipse.php.internal.debug.core.pathmapper;

import org.eclipse.php.debug.core.debugger.pathmapper.PathMapper;
import org2.eclipse.php.debug.core.debugger.pathmapper.PathMapper;

/**
* This class represents container for {@link PathMapper}
18 ...g/core/pathmapper/PathMapperRegistry.java → ...g/core/pathmapper/PathMapperRegistry.java
View file
@@ -8,7 +8,7 @@
* Contributors:
* Zend and IBM - Initial implementation
*******************************************************************************/
package org.eclipse.php.internal.debug.core.pathmapper;
package org2.eclipse.php.internal.debug.core.pathmapper;

import java.util.HashMap;
import java.util.Iterator;
@@ -18,14 +18,14 @@
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.Platform;
import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.php.debug.core.debugger.pathmapper.PathMapper;
import org.eclipse.php.internal.core.util.preferences.IXMLPreferencesStorable;
import org.eclipse.php.internal.core.util.preferences.XMLPreferencesReader;
import org.eclipse.php.internal.core.util.preferences.XMLPreferencesWriter;
import org.eclipse.php.internal.debug.core.interpreter.preferences.PHPexeItem;
import org.eclipse.php.internal.debug.core.preferences.IPHPExesListener;
import org.eclipse.php.internal.debug.core.preferences.PHPExesEvent;
import org.eclipse.php.internal.debug.core.preferences.PHPexes;
import org2.eclipse.php.debug.core.debugger.pathmapper.PathMapper;
import org2.eclipse.php.internal.core.util.preferences.IXMLPreferencesStorable;
import org2.eclipse.php.internal.core.util.preferences.XMLPreferencesReader;
import org2.eclipse.php.internal.core.util.preferences.XMLPreferencesWriter;
import org2.eclipse.php.internal.debug.core.interpreter.preferences.PHPexeItem;
import org2.eclipse.php.internal.debug.core.preferences.IPHPExesListener;
import org2.eclipse.php.internal.debug.core.preferences.PHPExesEvent;
import org2.eclipse.php.internal.debug.core.preferences.PHPexes;

import com.aptana.php.debug.core.server.PHPServersManager;
import com.aptana.php.debug.core.server.PHPWebServer;
2 ...al/debug/core/pathmapper/VirtualPath.java → ...al/debug/core/pathmapper/VirtualPath.java
View file
@@ -8,7 +8,7 @@
* Contributors:
* Zend and IBM - Initial implementation
*******************************************************************************/
package org.eclipse.php.internal.debug.core.pathmapper;
package org2.eclipse.php.internal.debug.core.pathmapper;

import java.io.File;
import java.util.Iterator;
4 ...ug/core/preferences/IPHPExesListener.java → ...ug/core/preferences/IPHPExesListener.java
View file
@@ -8,9 +8,9 @@
* Contributors:
* Zend and IBM - Initial implementation
*******************************************************************************/
package org.eclipse.php.internal.debug.core.preferences;
package org2.eclipse.php.internal.debug.core.preferences;

import org.eclipse.php.internal.debug.core.interpreter.preferences.PHPexeItem;
import org2.eclipse.php.internal.debug.core.interpreter.preferences.PHPexeItem;


/**
10 ...es/PHPDebugCorePreferenceInitializer.java → ...es/PHPDebugCorePreferenceInitializer.java
View file
@@ -8,7 +8,7 @@
* Contributors:
* Zend and IBM - Initial implementation
*******************************************************************************/
package org.eclipse.php.internal.debug.core.preferences;
package org2.eclipse.php.internal.debug.core.preferences;

import java.net.Inet4Address;
import java.net.InetAddress;
@@ -19,9 +19,9 @@
import org.eclipse.core.runtime.preferences.DefaultScope;
import org.eclipse.core.runtime.preferences.IEclipsePreferences;
import org.eclipse.jface.dialogs.MessageDialogWithToggle;
import org.eclipse.php.internal.debug.core.IPHPDebugConstants;
import org.eclipse.php.internal.debug.core.launching.PHPExecutableLaunchDelegate;
import org.eclipse.php.internal.debug.core.xdebug.communication.XDebugCommunicationDaemon;
import org2.eclipse.php.internal.debug.core.IPHPDebugConstants;
import org2.eclipse.php.internal.debug.core.launching.PHPExecutableLaunchDelegate;
import org2.eclipse.php.internal.debug.core.xdebug.communication.XDebugCommunicationDaemon;

import com.aptana.php.debug.core.IPHPDebugCorePreferenceKeys;
import com.aptana.php.debug.epl.PHPDebugEPLPlugin;
@@ -44,7 +44,7 @@ public void initializeDefaultPreferences() {
preferences.put(PHPDebugCorePreferenceNames.OUTPUT_ENCODING, "UTF-8"); //$NON-NLS-1$
preferences.put(IPHPDebugCorePreferenceKeys.CONFIGURATION_DELEGATE_CLASS, PHPExecutableLaunchDelegate.class.getName());
preferences.put(IPHPDebugCorePreferenceKeys.PHP_DEBUGGER_ID, XDebugCommunicationDaemon.XDEBUG_DEBUGGER_ID); // The default is Zend's debugger
preferences.put(IPHPDebugConstants.PHP_DEBUG_PARAMETERS_INITIALIZER, "org.eclipse.php.debug.core.defaultInitializer"); //$NON-NLS-1$
preferences.put(IPHPDebugConstants.PHP_DEBUG_PARAMETERS_INITIALIZER, "org2.eclipse.php.debug.core.defaultInitializer"); //$NON-NLS-1$
preferences.put(IPHPDebugCorePreferenceKeys.NOTIFY_NON_STANDARD_PORT, MessageDialogWithToggle.ALWAYS);
preferences.put(IPHPDebugCorePreferenceKeys.BREAK_ON_FIRST_LINE_FOR_UNKNOWN_JIT, MessageDialogWithToggle.PROMPT);

2 ...ferences/PHPDebugCorePreferenceNames.java → ...ferences/PHPDebugCorePreferenceNames.java
View file
@@ -8,7 +8,7 @@
* Contributors:
* Zend and IBM - Initial implementation
*******************************************************************************/
package org.eclipse.php.internal.debug.core.preferences;
package org2.eclipse.php.internal.debug.core.preferences;

import com.aptana.php.debug.epl.PHPDebugEPLPlugin;

12 ...ore/preferences/PHPDebuggersRegistry.java → ...ore/preferences/PHPDebuggersRegistry.java
View file
@@ -8,7 +8,7 @@
* Contributors:
* Zend and IBM - Initial implementation
*******************************************************************************/
package org.eclipse.php.internal.debug.core.preferences;
package org2.eclipse.php.internal.debug.core.preferences;

import java.util.Collection;
import java.util.Collections;
@@ -19,11 +19,11 @@
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IExtensionRegistry;
import org.eclipse.core.runtime.Platform;
import org.eclipse.php.internal.debug.core.Logger;
import org.eclipse.php.internal.debug.core.debugger.AbstractDebuggerConfiguration;
import org.eclipse.php.internal.debug.core.xdebug.communication.XDebugCommunicationDaemon;
import org.eclipse.ui.IPluginContribution;
import org.eclipse.ui.activities.WorkbenchActivityHelper;
import org2.eclipse.php.internal.debug.core.Logger;
import org2.eclipse.php.internal.debug.core.debugger.AbstractDebuggerConfiguration;
import org2.eclipse.php.internal.debug.core.xdebug.communication.XDebugCommunicationDaemon;

import com.aptana.php.debug.core.daemon.CommunicationDaemonRegistry;
import com.aptana.php.debug.core.daemon.ICommunicationDaemon;
@@ -135,14 +135,14 @@ private void loadDebuggers() {
final IExtensionRegistry registry = Platform.getExtensionRegistry();
final IConfigurationElement[] elements = registry.getConfigurationElementsFor(PHPDebugEPLPlugin.PLUGIN_ID, EXTENSION_POINT_NAME);
//We use the following HashMap in order to accumulate non PDT debugger configurations.
//that are extension to point: org.eclipse.php.debug.core.phpDebuggers
//that are extension to point: org2.eclipse.php.debug.core.phpDebuggers
HashMap<String, AbstractDebuggerConfiguration> nonPDTConfigurations = new HashMap<String, AbstractDebuggerConfiguration>();
for (final IConfigurationElement element : elements) {

if (DEBUGGER_TAG.equals(element.getName())) {
final String name = element.getAttribute(NAME_ATTRIBUTE);
final String id = element.getAttribute(ID_ATTRIBUTE);
// boolean isPDT = element.getNamespaceIdentifier().startsWith("org.eclipse.php");
// boolean isPDT = element.getNamespaceIdentifier().startsWith("org2.eclipse.php");
boolean isPDT = true;
boolean filter = WorkbenchActivityHelper.filterItem(new IPluginContribution() {
public String getLocalId() {
4 .../debug/core/preferences/PHPExesEvent.java → .../debug/core/preferences/PHPExesEvent.java
View file
@@ -8,9 +8,9 @@
* Contributors:
* Zend and IBM - Initial implementation
*******************************************************************************/
package org.eclipse.php.internal.debug.core.preferences;
package org2.eclipse.php.internal.debug.core.preferences;

import org.eclipse.php.internal.debug.core.interpreter.preferences.PHPexeItem;
import org2.eclipse.php.internal.debug.core.interpreter.preferences.PHPexeItem;


/**
6 ...re/preferences/PHPProjectPreferences.java → ...re/preferences/PHPProjectPreferences.java
View file
@@ -9,7 +9,7 @@
* Zend and IBM - Initial implementation
* Aptana - Use of the new IEclipsePreferences API
*******************************************************************************/
package org.eclipse.php.internal.debug.core.preferences;
package org2.eclipse.php.internal.debug.core.preferences;

import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ProjectScope;
@@ -18,8 +18,8 @@
import org.eclipse.core.runtime.preferences.IPreferencesService;
import org.eclipse.core.runtime.preferences.IScopeContext;
import org.eclipse.core.runtime.preferences.InstanceScope;
import org.eclipse.php.internal.debug.core.IPHPDebugConstants;
import org.eclipse.php.internal.debug.core.xdebug.communication.XDebugCommunicationDaemon;
import org2.eclipse.php.internal.debug.core.IPHPDebugConstants;
import org2.eclipse.php.internal.debug.core.xdebug.communication.XDebugCommunicationDaemon;

import com.aptana.php.debug.core.IPHPDebugCorePreferenceKeys;
import com.aptana.php.debug.core.server.PHPServersManager;
8 ...ernal/debug/core/preferences/PHPexes.java → ...ernal/debug/core/preferences/PHPexes.java
View file
@@ -9,7 +9,7 @@
* Zend and IBM - Initial implementation
* Aptana - Modifications and improvements.
*******************************************************************************/
package org.eclipse.php.internal.debug.core.preferences;
package org2.eclipse.php.internal.debug.core.preferences;

import java.util.ArrayList;
import java.util.Collection;
@@ -21,10 +21,10 @@
import java.util.Set;

import org.eclipse.core.runtime.preferences.IEclipsePreferences;
import org.eclipse.php.internal.debug.core.interpreter.preferences.PHPexeItem;
import org.eclipse.php.internal.debug.core.xdebug.communication.XDebugCommunicationDaemon;
import org.eclipse.php.internal.debug.core.zend.communication.DebuggerCommunicationDaemon;
import org.osgi.service.prefs.BackingStoreException;
import org2.eclipse.php.internal.debug.core.interpreter.preferences.PHPexeItem;
import org2.eclipse.php.internal.debug.core.xdebug.communication.XDebugCommunicationDaemon;
import org2.eclipse.php.internal.debug.core.zend.communication.DebuggerCommunicationDaemon;

import com.aptana.core.util.StringUtil;
import com.aptana.php.debug.core.IPHPDebugCorePreferenceKeys;
4 ...ferences/stepFilters/DebugStepFilter.java → ...ferences/stepFilters/DebugStepFilter.java
View file
@@ -8,9 +8,9 @@
* Contributors:
* Zend and IBM - Initial implementation
*******************************************************************************/
package org.eclipse.php.internal.debug.core.preferences.stepFilters;
package org2.eclipse.php.internal.debug.core.preferences.stepFilters;

import org.eclipse.php.internal.core.util.FileUtils;
import org2.eclipse.php.internal.core.util.FileUtils;


/**
11 ...tepFilters/DebugStepFilterController.java → ...tepFilters/DebugStepFilterController.java
View file
@@ -8,7 +8,7 @@
* Contributors:
* Zend and IBM - Initial implementation
*******************************************************************************/
package org.eclipse.php.internal.debug.core.preferences.stepFilters;
package org2.eclipse.php.internal.debug.core.preferences.stepFilters;

import java.util.ArrayList;
import java.util.HashMap;
@@ -19,9 +19,10 @@
import org.eclipse.core.runtime.InvalidRegistryObjectException;
import org.eclipse.core.runtime.Platform;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.php.internal.core.project.options.includepath.IncludePathVariableManager;
import org.eclipse.php.internal.core.util.FileUtils;
import org.eclipse.php.internal.debug.core.IPHPDebugConstants;

import org2.eclipse.php.internal.core.project.options.includepath.IncludePathVariableManager;
import org2.eclipse.php.internal.core.util.FileUtils;
import org2.eclipse.php.internal.debug.core.IPHPDebugConstants;

import com.aptana.php.debug.epl.PHPDebugEPLPlugin;

@@ -172,7 +173,7 @@ public void debugStepFilterModified(DebugStepFilterEvent event) {

private void readExtensionsList() {
ArrayList<DebugStepFilter> listToAdd = new ArrayList<DebugStepFilter>();
String stepFilterExtensionName = "org.eclipse.php.debug.core.phpDebugStepFilters"; //$NON-NLS-1$
String stepFilterExtensionName = "org2.eclipse.php.debug.core.phpDebugStepFilters"; //$NON-NLS-1$
IConfigurationElement[] elements = Platform.getExtensionRegistry().getConfigurationElementsFor(stepFilterExtensionName);
for (IConfigurationElement element : elements) {
if (element.getName().equals("stepFilter")) { //$NON-NLS-1$
2 ...ces/stepFilters/DebugStepFilterEvent.java → ...ces/stepFilters/DebugStepFilterEvent.java
View file
@@ -8,7 +8,7 @@
* Contributors:
* Zend and IBM - Initial implementation
*******************************************************************************/
package org.eclipse.php.internal.debug.core.preferences.stepFilters;
package org2.eclipse.php.internal.debug.core.preferences.stepFilters;

/**
* Use this event class when the Debug Step Filter Preferences are changed
2 ...Filters/IDebugStepFilterPrefListener.java → ...Filters/IDebugStepFilterPrefListener.java
View file
@@ -8,7 +8,7 @@
* Contributors:
* Zend and IBM - Initial implementation
*******************************************************************************/
package org.eclipse.php.internal.debug.core.preferences.stepFilters;
package org2.eclipse.php.internal.debug.core.preferences.stepFilters;

/**
* Represents a listener to Debug Step Filter Preferences changes.
2 ...erences/stepFilters/IStepFilterTypes.java → ...erences/stepFilters/IStepFilterTypes.java
View file
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
package org.eclipse.php.internal.debug.core.preferences.stepFilters;
package org2.eclipse.php.internal.debug.core.preferences.stepFilters;

/**
* This file contains all the available types of the Debug Step Filters
2 ...g/core/resources/ExternalFileWrapper.java → ...g/core/resources/ExternalFileWrapper.java
View file
@@ -8,7 +8,7 @@
* Contributors:
* Zend and IBM - Initial implementation
*******************************************************************************/
package org.eclipse.php.internal.debug.core.resources;
package org2.eclipse.php.internal.debug.core.resources;

import java.io.File;
import java.io.FileInputStream;
2 ...core/resources/ExternalFilesRegistry.java → ...core/resources/ExternalFilesRegistry.java
View file
@@ -1,4 +1,4 @@
package org.eclipse.php.internal.debug.core.resources;
package org2.eclipse.php.internal.debug.core.resources;

import java.util.Collection;
import java.util.HashMap;
2 ...ources/ExternalFilesRegistryListener.java → ...ources/ExternalFilesRegistryListener.java
View file
@@ -8,7 +8,7 @@
* Contributors:
* Zend and IBM - Initial implementation
*******************************************************************************/
package org.eclipse.php.internal.debug.core.resources;
package org2.eclipse.php.internal.debug.core.resources;


/**
2 ...sourcelookup/PHPSourceLookupDirector.java → ...sourcelookup/PHPSourceLookupDirector.java
View file
@@ -8,7 +8,7 @@
* Contributors:
* Zend and IBM - Initial implementation
*******************************************************************************/
package org.eclipse.php.internal.debug.core.sourcelookup;
package org2.eclipse.php.internal.debug.core.sourcelookup;

import org.eclipse.debug.core.model.IStackFrame;
import org.eclipse.debug.core.sourcelookup.AbstractSourceLookupDirector;
6 ...rcelookup/PHPSourceLookupParticipant.java → ...rcelookup/PHPSourceLookupParticipant.java
View file
@@ -8,7 +8,7 @@
* Contributors:
* Zend and IBM - Initial implementation
*******************************************************************************/
package org.eclipse.php.internal.debug.core.sourcelookup;
package org2.eclipse.php.internal.debug.core.sourcelookup;

import java.io.File;

@@ -19,8 +19,8 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
import org.eclipse.debug.core.sourcelookup.AbstractSourceLookupParticipant;
import org.eclipse.php.internal.debug.core.xdebug.dbgp.model.DBGpStackFrame;
import org.eclipse.php.internal.debug.core.zend.model.PHPStackFrame;
import org2.eclipse.php.internal.debug.core.xdebug.dbgp.model.DBGpStackFrame;
import org2.eclipse.php.internal.debug.core.zend.model.PHPStackFrame;

/**
* The PHP source lookup participant knows how to translate a
2 .../sourcelookup/PHPSourceNotFoundInput.java → .../sourcelookup/PHPSourceNotFoundInput.java
View file
@@ -8,7 +8,7 @@
* Contributors:
* Zend and IBM - Initial implementation
*******************************************************************************/
package org.eclipse.php.internal.debug.core.sourcelookup;
package org2.eclipse.php.internal.debug.core.sourcelookup;

import org.eclipse.debug.core.model.IStackFrame;

8 ...lookup/PHPSourcePathComputerDelegate.java → ...lookup/PHPSourcePathComputerDelegate.java
View file
@@ -8,7 +8,7 @@
* Contributors:
* Zend and IBM - Initial implementation
*******************************************************************************/
package org.eclipse.php.internal.debug.core.sourcelookup;
package org2.eclipse.php.internal.debug.core.sourcelookup;

import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ResourcesPlugin;
@@ -17,9 +17,9 @@
import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.debug.core.sourcelookup.ISourceContainer;
import org.eclipse.debug.core.sourcelookup.ISourcePathComputerDelegate;
import org.eclipse.php.internal.debug.core.IPHPDebugConstants;
import org.eclipse.php.internal.debug.core.sourcelookup.containers.PHPCompositeSourceContainer;
import org.eclipse.php.internal.debug.core.sourcelookup.containers.WorkspaceRootSourceContainer;
import org2.eclipse.php.internal.debug.core.IPHPDebugConstants;
import org2.eclipse.php.internal.debug.core.sourcelookup.containers.PHPCompositeSourceContainer;
import org2.eclipse.php.internal.debug.core.sourcelookup.containers.WorkspaceRootSourceContainer;

/**
* Computes the default source lookup path for a PHP launch configuration. For
2 ...celookup/containers/LocalFileStorage.java → ...celookup/containers/LocalFileStorage.java
View file
@@ -8,7 +8,7 @@
* Contributors:
* Zend and IBM - Initial implementation
*******************************************************************************/
package org.eclipse.php.internal.debug.core.sourcelookup.containers;
package org2.eclipse.php.internal.debug.core.sourcelookup.containers;

import java.io.File;
import java.io.FileInputStream;
6 ...ntainers/PHPCompositeSourceContainer.java → ...ntainers/PHPCompositeSourceContainer.java
View file
@@ -8,7 +8,7 @@
* Contributors:
* Zend and IBM - Initial implementation
*******************************************************************************/
package org.eclipse.php.internal.debug.core.sourcelookup.containers;
package org2.eclipse.php.internal.debug.core.sourcelookup.containers;

import java.io.File;
import java.util.ArrayList;
@@ -23,8 +23,8 @@
import org.eclipse.debug.core.sourcelookup.ISourceContainerType;
import org.eclipse.debug.core.sourcelookup.containers.CompositeSourceContainer;
import org.eclipse.debug.core.sourcelookup.containers.ProjectSourceContainer;
import org.eclipse.php.internal.core.project.IIncludePathEntry;
import org.eclipse.php.internal.core.project.options.PHPProjectOptions;
import org2.eclipse.php.internal.core.project.IIncludePathEntry;
import org2.eclipse.php.internal.core.project.options.PHPProjectOptions;

public class PHPCompositeSourceContainer extends CompositeSourceContainer {

4 ...ntainers/PHPDirectorySourceContainer.java → ...ntainers/PHPDirectorySourceContainer.java
View file
@@ -8,7 +8,7 @@
* Contributors:
* Zend and IBM - Initial implementation
*******************************************************************************/
package org.eclipse.php.internal.debug.core.sourcelookup.containers;
package org2.eclipse.php.internal.debug.core.sourcelookup.containers;

import java.io.File;
import java.io.IOException;
@@ -20,7 +20,7 @@
import org.eclipse.debug.core.sourcelookup.ISourceContainerType;
import org.eclipse.debug.core.sourcelookup.containers.DirectorySourceContainer;
import org.eclipse.debug.core.sourcelookup.containers.ZipEntryStorage;
import org.eclipse.php.internal.debug.core.Logger;
import org2.eclipse.php.internal.debug.core.Logger;

public class PHPDirectorySourceContainer extends DirectorySourceContainer {

2 ...rs/PHPExternalArchiveSourceContainer.java → ...rs/PHPExternalArchiveSourceContainer.java
View file
@@ -8,7 +8,7 @@
* Contributors:
* Zend and IBM - Initial implementation
*******************************************************************************/
package org.eclipse.php.internal.debug.core.sourcelookup.containers;
package org2.eclipse.php.internal.debug.core.sourcelookup.containers;

import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
2 ...up/containers/PHPFileSourceContainer.java → ...up/containers/PHPFileSourceContainer.java
View file
@@ -8,7 +8,7 @@
* Contributors:
* Zend and IBM - Initial implementation
*******************************************************************************/
package org.eclipse.php.internal.debug.core.sourcelookup.containers;
package org2.eclipse.php.internal.debug.core.sourcelookup.containers;

import java.io.File;

4 ...ontainers/PHPVariableSourceContainer.java → ...ontainers/PHPVariableSourceContainer.java
View file
@@ -8,7 +8,7 @@
* Contributors:
* Zend and IBM - Initial implementation
*******************************************************************************/
package org.eclipse.php.internal.debug.core.sourcelookup.containers;
package org2.eclipse.php.internal.debug.core.sourcelookup.containers;

import java.io.File;

@@ -20,7 +20,7 @@
import org.eclipse.debug.core.sourcelookup.ISourceContainer;
import org.eclipse.debug.core.sourcelookup.ISourceContainerType;
import org.eclipse.debug.core.sourcelookup.containers.CompositeSourceContainer;
import org.eclipse.php.internal.core.project.options.PHPProjectOptions;
import org2.eclipse.php.internal.core.project.options.PHPProjectOptions;

import com.aptana.editor.php.internal.core.IPHPConstants;

2 ...tainers/WorkspaceRootSourceContainer.java → ...tainers/WorkspaceRootSourceContainer.java
View file
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
package org.eclipse.php.internal.debug.core.sourcelookup.containers;
package org2.eclipse.php.internal.debug.core.sourcelookup.containers;

import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.debug.core.sourcelookup.ISourceContainerType;
4 ...ernal/debug/core/xdebug/GeneralUtils.java → ...ernal/debug/core/xdebug/GeneralUtils.java
View file
@@ -8,9 +8,9 @@
* Contributors:
* IBM Corporation - initial implementation
*******************************************************************************/
package org.eclipse.php.internal.debug.core.xdebug;
package org2.eclipse.php.internal.debug.core.xdebug;

import org.eclipse.php.internal.debug.core.xdebug.dbgp.DBGpPreferences;
import org2.eclipse.php.internal.debug.core.xdebug.dbgp.DBGpPreferences;

import com.aptana.php.debug.core.preferences.PHPDebugPreferencesUtil;

2 .../internal/debug/core/xdebug/IDELayer.java → .../internal/debug/core/xdebug/IDELayer.java
View file
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial implementation
*******************************************************************************/
package org.eclipse.php.internal.debug.core.xdebug;
package org2.eclipse.php.internal.debug.core.xdebug;

import org.eclipse.core.resources.IProject;
import org.eclipse.debug.core.ILaunchConfiguration;
4 ...al/debug/core/xdebug/IDELayerFactory.java → ...al/debug/core/xdebug/IDELayerFactory.java
View file
@@ -8,9 +8,9 @@
* Contributors:
* IBM Corporation - initial implementation
*******************************************************************************/
package org.eclipse.php.internal.debug.core.xdebug;
package org2.eclipse.php.internal.debug.core.xdebug;

import org.eclipse.php.internal.debug.core.xdebug.breakpoints.PdtLayer;
import org2.eclipse.php.internal.debug.core.xdebug.breakpoints.PdtLayer;

public class IDELayerFactory {
private static PdtLayer layer = new PdtLayer();
4 ...bug/core/xdebug/XDebugPreferenceInit.java → ...bug/core/xdebug/XDebugPreferenceInit.java
View file
@@ -8,11 +8,11 @@
* Contributors:
* IBM Corporation - initial implementation
*******************************************************************************/
package org.eclipse.php.internal.debug.core.xdebug;
package org2.eclipse.php.internal.debug.core.xdebug;

import org.eclipse.core.runtime.preferences.DefaultScope;
import org.eclipse.core.runtime.preferences.IEclipsePreferences;
import org.eclipse.php.internal.debug.core.xdebug.dbgp.DBGpPreferences;
import org2.eclipse.php.internal.debug.core.xdebug.dbgp.DBGpPreferences;

import com.aptana.php.debug.epl.PHPDebugEPLPlugin;

8 ...ebug/core/xdebug/XDebugPreferenceMgr.java → ...ebug/core/xdebug/XDebugPreferenceMgr.java
View file
@@ -8,18 +8,18 @@
* Contributors:
* IBM Corporation - initial implementation
*******************************************************************************/
package org.eclipse.php.internal.debug.core.xdebug;
package org2.eclipse.php.internal.debug.core.xdebug;

import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.preferences.DefaultScope;
import org.eclipse.core.runtime.preferences.IEclipsePreferences;
import org.eclipse.core.runtime.preferences.IPreferencesService;
import org.eclipse.core.runtime.preferences.IScopeContext;
import org.eclipse.core.runtime.preferences.InstanceScope;
import org.eclipse.php.internal.debug.core.PHPDebugCoreMessages;
import org.eclipse.php.internal.debug.core.xdebug.dbgp.DBGpPreferences;
import org.eclipse.php.internal.debug.core.xdebug.dbgp.DBGpProxyHandler;
import org.osgi.service.prefs.BackingStoreException;
import org2.eclipse.php.internal.debug.core.PHPDebugCoreMessages;
import org2.eclipse.php.internal.debug.core.xdebug.dbgp.DBGpPreferences;
import org2.eclipse.php.internal.debug.core.xdebug.dbgp.DBGpProxyHandler;

import com.aptana.php.debug.core.preferences.PHPDebugPreferencesUtil;
import com.aptana.php.debug.epl.PHPDebugEPLPlugin;
6 ...re/xdebug/XDebugUIAttributeConstants.java → ...re/xdebug/XDebugUIAttributeConstants.java
View file
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial implementation
*******************************************************************************/
package org.eclipse.php.internal.debug.core.xdebug;
package org2.eclipse.php.internal.debug.core.xdebug;

import com.aptana.php.debug.epl.PHPDebugEPLPlugin;

@@ -23,7 +23,7 @@ public interface XDebugUIAttributeConstants {

// launch id constants
/*
public static final String LAUNCH_CONFIG_TYPE_EXE = "org.eclipse.php.xdebug.core.XdebugExelaunchConfigurationType";
public static final String LAUNCH_CONFIG_TYPE_WEB = "org.eclipse.php.xdebug.core.XdebugWeblaunchConfigurationType";
public static final String LAUNCH_CONFIG_TYPE_EXE = "org2.eclipse.php.xdebug.core.XdebugExelaunchConfigurationType";
public static final String LAUNCH_CONFIG_TYPE_WEB = "org2.eclipse.php.xdebug.core.XdebugWeblaunchConfigurationType";
*/
}
32 ...ore/xdebug/breakpoints/PdtBreakpoint.java → ...ore/xdebug/breakpoints/PdtBreakpoint.java
View file
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial implementation
*******************************************************************************/
package org.eclipse.php.internal.debug.core.xdebug.breakpoints;
package org2.eclipse.php.internal.debug.core.xdebug.breakpoints;

import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IMarker;
@@ -18,11 +18,11 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.Path;
import org.eclipse.debug.core.model.IBreakpoint;
import org.eclipse.php.internal.debug.core.IPHPDebugConstants;
import org.eclipse.php.internal.debug.core.model.PHPConditionalBreakpoint;
import org.eclipse.php.internal.debug.core.model.PHPLineBreakpoint;
import org.eclipse.php.internal.debug.core.model.PHPRunToLineBreakpoint;
import org.eclipse.php.internal.debug.core.xdebug.dbgp.DBGpBreakpoint;
import org2.eclipse.php.internal.debug.core.IPHPDebugConstants;
import org2.eclipse.php.internal.debug.core.model.PHPConditionalBreakpoint;
import org2.eclipse.php.internal.debug.core.model.PHPLineBreakpoint;
import org2.eclipse.php.internal.debug.core.model.PHPRunToLineBreakpoint;
import org2.eclipse.php.internal.debug.core.xdebug.dbgp.DBGpBreakpoint;

/**
*
@@ -93,79 +93,79 @@ public PdtBreakpoint(PHPLineBreakpoint breakpoint) {

/*
* (non-Javadoc)
* @see org.eclipse.php.xdebug.core.dbgp.DBGpBreakpoint#getBreakpoint()
* @see org2.eclipse.php.xdebug.core.dbgp.DBGpBreakpoint#getBreakpoint()
*/
public IBreakpoint getBreakpoint() {
return bp;
}

/*
* (non-Javadoc)
* @see org.eclipse.php.xdebug.core.dbgp.DBGpBreakpoint#setBreakpoint(org.eclipse.debug.core.model.IBreakpoint)
* @see org2.eclipse.php.xdebug.core.dbgp.DBGpBreakpoint#setBreakpoint(org.eclipse.debug.core.model.IBreakpoint)
*/
public void setBreakpoint(IBreakpoint breakpoint) {
bp = (PHPLineBreakpoint) breakpoint;
}

/*
* (non-Javadoc)
* @see org.eclipse.php.xdebug.core.dbgp.DBGpBreakpoint#getID()
* @see org2.eclipse.php.xdebug.core.dbgp.DBGpBreakpoint#getID()
*/
public int getID() {
return bp.getRuntimeBreakpoint().getID();
}

/*
* (non-Javadoc)
* @see org.eclipse.php.xdebug.core.dbgp.DBGpBreakpoint#setID(int)
* @see org2.eclipse.php.xdebug.core.dbgp.DBGpBreakpoint#setID(int)
*/
public void setID(int id) {
bp.getRuntimeBreakpoint().setID(id);
}

/*
* (non-Javadoc)
* @see org.eclipse.php.xdebug.core.dbgp.DBGpBreakpoint#isConditionChanged()
* @see org2.eclipse.php.xdebug.core.dbgp.DBGpBreakpoint#isConditionChanged()
*/
public boolean hasConditionChanged() {
return bp.isConditionChanged();
}

/*
* (non-Javadoc)
* @see org.eclipse.php.xdebug.core.dbgp.DBGpBreakpoint#setConditionChanged(boolean)
* @see org2.eclipse.php.xdebug.core.dbgp.DBGpBreakpoint#setConditionChanged(boolean)
*/
public void resetConditionChanged() {
bp.setConditionChanged(false);
}

/*
* (non-Javadoc)
* @see org.eclipse.php.xdebug.core.dbgp.DBGpBreakpoint#getIFile()
* @see org2.eclipse.php.xdebug.core.dbgp.DBGpBreakpoint#getIFile()
*/
public IFile getIFile() {
return workspaceFile;
}

/*
* (non-Javadoc)
* @see org.eclipse.php.xdebug.core.IDEBreakpoint#getFileName()
* @see org2.eclipse.php.xdebug.core.IDEBreakpoint#getFileName()
*/
public String getFileName() {
return bp.getRuntimeBreakpoint().getFileName();
}

/*
* (non-Javadoc)
* @see org.eclipse.php.xdebug.core.IDEBreakpoint#getLineNumber()
* @see org2.eclipse.php.xdebug.core.IDEBreakpoint#getLineNumber()
*/
public int getLineNumber() {
return bp.getRuntimeBreakpoint().getLineNumber();
}

/*
* (non-Javadoc)
* @see org.eclipse.php.xdebug.core.IDEBreakpoint#getExpression()
* @see org2.eclipse.php.xdebug.core.IDEBreakpoint#getExpression()
*/
public String getExpression() {
return bp.getRuntimeBreakpoint().getExpression();
24 ...bug/core/xdebug/breakpoints/PdtLayer.java → ...bug/core/xdebug/breakpoints/PdtLayer.java
View file
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial implementation
*******************************************************************************/
package org.eclipse.php.internal.debug.core.xdebug.breakpoints;
package org2.eclipse.php.internal.debug.core.xdebug.breakpoints;

import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
@@ -20,16 +20,16 @@
import org.eclipse.debug.core.model.IBreakpoint;
import org.eclipse.debug.core.model.IStackFrame;
import org.eclipse.debug.core.sourcelookup.ISourceContainer;
import org.eclipse.php.internal.debug.core.IPHPDebugConstants;
import org.eclipse.php.internal.debug.core.model.PHPLineBreakpoint;
import org.eclipse.php.internal.debug.core.model.PHPRunToLineBreakpoint;
import org.eclipse.php.internal.debug.core.sourcelookup.PHPSourceNotFoundInput;
import org.eclipse.php.internal.debug.core.sourcelookup.containers.PHPCompositeSourceContainer;
import org.eclipse.php.internal.debug.core.xdebug.IDELayer;
import org.eclipse.php.internal.debug.core.xdebug.dbgp.DBGpBreakpoint;
import org.eclipse.php.internal.debug.core.xdebug.dbgp.DBGpBreakpointFacade;
import org.eclipse.php.internal.debug.core.xdebug.dbgp.DBGpLogger;
import org.eclipse.php.internal.debug.core.zend.debugger.Breakpoint;
import org2.eclipse.php.internal.debug.core.IPHPDebugConstants;
import org2.eclipse.php.internal.debug.core.model.PHPLineBreakpoint;
import org2.eclipse.php.internal.debug.core.model.PHPRunToLineBreakpoint;
import org2.eclipse.php.internal.debug.core.sourcelookup.PHPSourceNotFoundInput;
import org2.eclipse.php.internal.debug.core.sourcelookup.containers.PHPCompositeSourceContainer;
import org2.eclipse.php.internal.debug.core.xdebug.IDELayer;
import org2.eclipse.php.internal.debug.core.xdebug.dbgp.DBGpBreakpoint;
import org2.eclipse.php.internal.debug.core.xdebug.dbgp.DBGpBreakpointFacade;
import org2.eclipse.php.internal.debug.core.xdebug.dbgp.DBGpLogger;
import org2.eclipse.php.internal.debug.core.zend.debugger.Breakpoint;

public class PdtLayer implements IDELayer, DBGpBreakpointFacade {

@@ -120,7 +120,7 @@ public IBreakpoint createRunToLineBreakpoint(IFile fileName, int lineNumber) thr
}

public String getSystemDebugProperty() {
return "org.eclipse.php.debug.ui.activeDebugging"; //$NON-NLS-1$
return "org2.eclipse.php.debug.ui.activeDebugging"; //$NON-NLS-1$
}

}
46 ...munication/XDebugCommunicationDaemon.java → ...munication/XDebugCommunicationDaemon.java
View file
@@ -11,7 +11,7 @@
/**
*
*/
package org.eclipse.php.internal.debug.core.xdebug.communication;
package org2.eclipse.php.internal.debug.core.xdebug.communication;

import java.net.Socket;
import java.net.URL;
@@ -32,23 +32,23 @@
import org.eclipse.debug.ui.DebugUITools;
import org.eclipse.debug.ui.IDebugUIConstants;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.php.debug.core.debugger.pathmapper.PathMapper;
import org.eclipse.php.internal.debug.core.PHPDebugCoreMessages;
import org.eclipse.php.internal.debug.core.daemon.AbstractDebuggerCommunicationDaemon;
import org.eclipse.php.internal.debug.core.launching.PHPLaunchUtilities;
import org.eclipse.php.internal.debug.core.pathmapper.PathMapperRegistry;
import org.eclipse.php.internal.debug.core.sourcelookup.PHPSourceLookupDirector;
import org.eclipse.php.internal.debug.core.xdebug.IDELayerFactory;
import org.eclipse.php.internal.debug.core.xdebug.XDebugPreferenceMgr;
import org.eclipse.php.internal.debug.core.xdebug.XDebugPreferenceMgr.AcceptRemoteSession;
import org.eclipse.php.internal.debug.core.xdebug.dbgp.DBGpBreakpointFacade;
import org.eclipse.php.internal.debug.core.xdebug.dbgp.DBGpLogger;
import org.eclipse.php.internal.debug.core.xdebug.dbgp.model.DBGpMultiSessionTarget;
import org.eclipse.php.internal.debug.core.xdebug.dbgp.model.DBGpTarget;
import org.eclipse.php.internal.debug.core.xdebug.dbgp.session.DBGpSession;
import org.eclipse.php.internal.debug.core.xdebug.dbgp.session.DBGpSessionHandler;
import org.eclipse.php.internal.debug.core.xdebug.dbgp.session.IDBGpSessionListener;
import org.eclipse.swt.widgets.Display;
import org2.eclipse.php.debug.core.debugger.pathmapper.PathMapper;
import org2.eclipse.php.internal.debug.core.PHPDebugCoreMessages;
import org2.eclipse.php.internal.debug.core.daemon.AbstractDebuggerCommunicationDaemon;
import org2.eclipse.php.internal.debug.core.launching.PHPLaunchUtilities;
import org2.eclipse.php.internal.debug.core.pathmapper.PathMapperRegistry;
import org2.eclipse.php.internal.debug.core.sourcelookup.PHPSourceLookupDirector;
import org2.eclipse.php.internal.debug.core.xdebug.IDELayerFactory;
import org2.eclipse.php.internal.debug.core.xdebug.XDebugPreferenceMgr;
import org2.eclipse.php.internal.debug.core.xdebug.XDebugPreferenceMgr.AcceptRemoteSession;
import org2.eclipse.php.internal.debug.core.xdebug.dbgp.DBGpBreakpointFacade;
import org2.eclipse.php.internal.debug.core.xdebug.dbgp.DBGpLogger;
import org2.eclipse.php.internal.debug.core.xdebug.dbgp.model.DBGpMultiSessionTarget;
import org2.eclipse.php.internal.debug.core.xdebug.dbgp.model.DBGpTarget;
import org2.eclipse.php.internal.debug.core.xdebug.dbgp.session.DBGpSession;
import org2.eclipse.php.internal.debug.core.xdebug.dbgp.session.DBGpSessionHandler;
import org2.eclipse.php.internal.debug.core.xdebug.dbgp.session.IDBGpSessionListener;

import com.aptana.php.debug.core.server.PHPServersManager;
import com.aptana.php.debug.epl.PHPDebugEPLPlugin;
@@ -63,7 +63,7 @@
public class XDebugCommunicationDaemon extends AbstractDebuggerCommunicationDaemon
{

public static final String XDEBUG_DEBUGGER_ID = "org.eclipse.php.debug.core.xdebugDebugger"; //$NON-NLS-1$
public static final String XDEBUG_DEBUGGER_ID = "org2.eclipse.php.debug.core.xdebugDebugger"; //$NON-NLS-1$
public static final int[] DEBUGGER_DEFAULT_PORTS = new int[] { 9000 };
private PortChangeListener portChangeListener;

@@ -76,7 +76,7 @@ public XDebugCommunicationDaemon()

/*
* (non-Javadoc)
* @see org.eclipse.php.internal.debug.core.daemon.AbstractDebuggerCommunicationDaemon#init()
* @see org2.eclipse.php.internal.debug.core.daemon.AbstractDebuggerCommunicationDaemon#init()
*/
public void init()
{
@@ -348,12 +348,12 @@ private void createLaunch(DBGpSession session)
// public void run() {
// IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
// //code the debug perspectives.
// //org.eclipse.php.debug.ui.PHPDebugPerspective
// //org2.eclipse.php.debug.ui.PHPDebugPerspective
// //org.eclipse.debug.ui.DebugPerspective
// //also look at the PHPLaunchUtilities
// if (!PerspectiveManager.isCurrentPerspective(window, "org.eclipse.php.debug.ui.PHPDebugPerspective")) {
// if(PerspectiveManager.shouldSwitchPerspective(window, "org.eclipse.php.debug.ui.PHPDebugPerspective")) {
// PerspectiveManager.switchToPerspective(window, "org.eclipse.php.debug.ui.PHPDebugPerspective");
// if (!PerspectiveManager.isCurrentPerspective(window, "org2.eclipse.php.debug.ui.PHPDebugPerspective")) {
// if(PerspectiveManager.shouldSwitchPerspective(window, "org2.eclipse.php.debug.ui.PHPDebugPerspective")) {
// PerspectiveManager.switchToPerspective(window, "org2.eclipse.php.debug.ui.PHPDebugPerspective");
// }
// }
// }
2 ...ebug/core/xdebug/dbgp/DBGpBreakpoint.java → ...ebug/core/xdebug/dbgp/DBGpBreakpoint.java
View file
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial implementation
*******************************************************************************/
package org.eclipse.php.internal.debug.core.xdebug.dbgp;
package org2.eclipse.php.internal.debug.core.xdebug.dbgp;

import org.eclipse.core.resources.IFile;
import org.eclipse.debug.core.model.IBreakpoint;
2 ...ore/xdebug/dbgp/DBGpBreakpointFacade.java → ...ore/xdebug/dbgp/DBGpBreakpointFacade.java
View file
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial implementation
*******************************************************************************/
package org.eclipse.php.internal.debug.core.xdebug.dbgp;
package org2.eclipse.php.internal.debug.core.xdebug.dbgp;

import org.eclipse.core.resources.IFile;
import org.eclipse.debug.core.DebugException;
2 ...al/debug/core/xdebug/dbgp/DBGpLogger.java → ...al/debug/core/xdebug/dbgp/DBGpLogger.java
View file
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial implementation
*******************************************************************************/
package org.eclipse.php.internal.debug.core.xdebug.dbgp;
package org2.eclipse.php.internal.debug.core.xdebug.dbgp;

import java.io.ByteArrayOutputStream;
import java.io.PrintStream;
2 ...bug/core/xdebug/dbgp/DBGpPreferences.java → ...bug/core/xdebug/dbgp/DBGpPreferences.java
View file
@@ -8,7 +8,7 @@
* Contributors:
* Zend and IBM - Initial implementation
*******************************************************************************/
package org.eclipse.php.internal.debug.core.xdebug.dbgp;
package org2.eclipse.php.internal.debug.core.xdebug.dbgp;

import java.util.HashMap;
import java.util.Map;