# HG changeset patch # User Eugene Ostroukhov # Date 1265668998 28800 # Node ID be38c358a5159bf099d110fe8ffc4f603ffbc3f4 # Parent 155bb59f5bce385f31cfae1c0ebf41efb30531e5# Parent 7dc2457b02ac99e8138bde4dcf978e076cb345ce Heads merge diff -r 7dc2457b02ac -r be38c358a515 org.symbian.tools.wrttools.debug.core/.options --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/org.symbian.tools.wrttools.debug.core/.options Mon Feb 08 14:43:18 2010 -0800 @@ -0,0 +1,4 @@ +org.symbian.tools.wrttools.debug.core/debug=false +org.symbian.tools.wrttools.debug.core/debugConnection=false +org.symbian.tools.wrttools.debug.core/debugResources=false +org.symbian.tools.wrttools.debug.core/debugBreakpoints=false \ No newline at end of file diff -r 7dc2457b02ac -r be38c358a515 org.symbian.tools.wrttools.debug.core/src/org/symbian/tools/wrttools/debug/internal/Activator.java --- a/org.symbian.tools.wrttools.debug.core/src/org/symbian/tools/wrttools/debug/internal/Activator.java Mon Feb 08 12:16:10 2010 -0800 +++ b/org.symbian.tools.wrttools.debug.core/src/org/symbian/tools/wrttools/debug/internal/Activator.java Mon Feb 08 14:43:18 2010 -0800 @@ -19,6 +19,7 @@ package org.symbian.tools.wrttools.debug.internal; import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Status; import org.eclipse.jface.resource.ImageRegistry; import org.eclipse.ui.plugin.AbstractUIPlugin; @@ -32,6 +33,13 @@ // The plug-in ID public static final String PLUGIN_ID = "org.symbian.tools.wrttools.debug.core"; + public static final boolean DEBUG = Platform.inDebugMode() && Boolean.valueOf(Platform.getDebugOption(PLUGIN_ID + "/debug")); + public static final boolean DEBUG_CONNECTION = DEBUG && Boolean.valueOf(Platform.getDebugOption(PLUGIN_ID + "/debugConnection")); + public static final boolean DEBUG_RESOURCES = DEBUG && Boolean.valueOf(Platform.getDebugOption(PLUGIN_ID + "/debugResources")); + public static final boolean DEBUG_BREAKPOINTS = DEBUG + && Boolean.valueOf(Platform.getDebugOption(PLUGIN_ID + + "/debugBreakpoints")); + // The shared instance private static Activator plugin; diff -r 7dc2457b02ac -r be38c358a515 org.symbian.tools.wrttools.debug.core/src/org/symbian/tools/wrttools/debug/internal/WorkspaceLineBreakpointAdapter.java --- a/org.symbian.tools.wrttools.debug.core/src/org/symbian/tools/wrttools/debug/internal/WorkspaceLineBreakpointAdapter.java Mon Feb 08 12:16:10 2010 -0800 +++ b/org.symbian.tools.wrttools.debug.core/src/org/symbian/tools/wrttools/debug/internal/WorkspaceLineBreakpointAdapter.java Mon Feb 08 14:43:18 2010 -0800 @@ -19,10 +19,10 @@ package org.symbian.tools.wrttools.debug.internal; import org.chromium.debug.core.model.LineBreakpointAdapter; +import org.chromium.debug.core.model.VProjectWorkspaceBridge; import org.eclipse.ui.IWorkbenchPart; import org.eclipse.ui.texteditor.ITextEditor; import org.eclipse.wst.jsdt.internal.ui.javaeditor.JavaEditor; -import org.symbian.tools.wrttools.debug.internal.launch.WRTProjectWorkspaceBridge; @SuppressWarnings("restriction") public class WorkspaceLineBreakpointAdapter extends LineBreakpointAdapter { @@ -37,6 +37,6 @@ @Override protected String getDebugModelId() { - return WRTProjectWorkspaceBridge.DEBUG_MODEL_ID; + return VProjectWorkspaceBridge.DEBUG_MODEL_ID; } } diff -r 7dc2457b02ac -r be38c358a515 org.symbian.tools.wrttools.debug.core/src/org/symbian/tools/wrttools/debug/internal/launch/DebugConnectionJob.java --- a/org.symbian.tools.wrttools.debug.core/src/org/symbian/tools/wrttools/debug/internal/launch/DebugConnectionJob.java Mon Feb 08 12:16:10 2010 -0800 +++ b/org.symbian.tools.wrttools.debug.core/src/org/symbian/tools/wrttools/debug/internal/launch/DebugConnectionJob.java Mon Feb 08 14:43:18 2010 -0800 @@ -34,6 +34,7 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.debug.core.DebugPlugin; import org.eclipse.debug.core.ILaunch; +import org.symbian.tools.wrttools.debug.internal.Activator; import org.symbian.tools.wrttools.previewer.http.IPreviewStartupListener; public class DebugConnectionJob implements IPreviewStartupListener { @@ -48,6 +49,10 @@ public DebugConnectionJob(IProject project, final int port, final ILaunch launch) { + if (Activator.DEBUG_CONNECTION) { + System.out.println("Debugging " + project.getName() + " on port " + + port + ", launch: " + launch.getLaunchConfiguration()); + } this.project = project; this.port = port; this.launch = launch; diff -r 7dc2457b02ac -r be38c358a515 org.symbian.tools.wrttools.previewer/src/org/symbian/tools/wrttools/previewer/preview/PreviewView.java --- a/org.symbian.tools.wrttools.previewer/src/org/symbian/tools/wrttools/previewer/preview/PreviewView.java Mon Feb 08 12:16:10 2010 -0800 +++ b/org.symbian.tools.wrttools.previewer/src/org/symbian/tools/wrttools/previewer/preview/PreviewView.java Mon Feb 08 14:43:18 2010 -0800 @@ -7,9 +7,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.net.URL; import java.util.Collection; -import java.util.Enumeration; import java.util.HashMap; import java.util.HashSet; import java.util.Map; @@ -26,8 +24,6 @@ import org.eclipse.core.resources.IWorkspaceRoot; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.FileLocator; -import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Platform; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.MessageDialogWithToggle; @@ -39,7 +35,6 @@ import org.eclipse.ui.part.MessagePage; import org.eclipse.ui.part.PageBook; import org.eclipse.ui.part.PageBookView; -import org.osgi.framework.Bundle; import org.symbian.tools.wrttools.previewer.IWrtEditingPreferences; import org.symbian.tools.wrttools.previewer.PreviewerPlugin; import org.symbian.tools.wrttools.util.ProjectUtils; @@ -51,7 +46,13 @@ public boolean visit(IResourceDelta delta) throws CoreException { if (isRelevantResource(delta.getResource())) { - files.add((IFile) delta.getResource()); + if ((delta.getFlags() & (IResourceDelta.CONTENT + | IResourceDelta.COPIED_FROM | IResourceDelta.ENCODING + | IResourceDelta.LOCAL_CHANGED + | IResourceDelta.MOVED_FROM | IResourceDelta.MOVED_TO + | IResourceDelta.MOVED_FROM | IResourceDelta.REPLACED | IResourceDelta.SYNC)) != 0) { + files.add((IFile) delta.getResource()); + } } return true; } diff -r 7dc2457b02ac -r be38c358a515 org.symbian.tools.wrttools.product/launch/WRT IDE Product (Windows).launch --- a/org.symbian.tools.wrttools.product/launch/WRT IDE Product (Windows).launch Mon Feb 08 12:16:10 2010 -0800 +++ b/org.symbian.tools.wrttools.product/launch/WRT IDE Product (Windows).launch Mon Feb 08 14:43:18 2010 -0800 @@ -5,7 +5,7 @@ - + @@ -21,10 +21,475 @@ - - + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +