Merged and committed changes for bug 1652.
--- 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:02:37 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;
}
}
--- 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:02:37 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;
}