# HG changeset patch # User Eugene Ostroukhov # Date 1264039215 28800 # Node ID 954dbf7baac6387751335a980e6f8caaab0a1fe4 # Parent 641b65b1431890cc68e99a61957d8f43901b9fc8 Merged with the most current version diff -r 641b65b14318 -r 954dbf7baac6 org.symbian.tools.wrttools.editing/META-INF/MANIFEST.MF --- a/org.symbian.tools.wrttools.editing/META-INF/MANIFEST.MF Wed Jan 20 16:51:26 2010 -0800 +++ b/org.symbian.tools.wrttools.editing/META-INF/MANIFEST.MF Wed Jan 20 18:00:15 2010 -0800 @@ -7,16 +7,16 @@ Bundle-Vendor: Symbian Foundation Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, - org.eclipse.wst.sse.core;bundle-version="1.1.400", - org.eclipse.wst.sse.ui;bundle-version="1.1.100", - org.eclipse.wst.xml.core;bundle-version="1.1.400", - org.eclipse.wst.xml.ui;bundle-version="1.1.0", - org.eclipse.jface.text;bundle-version="3.5.0", + org.eclipse.wst.sse.core;bundle-version="1.1.401", + org.eclipse.wst.sse.ui;bundle-version="1.1.101", + org.eclipse.wst.xml.core;bundle-version="1.1.401", + org.eclipse.wst.xml.ui;bundle-version="1.1.1", + org.eclipse.jface.text;bundle-version="3.5.1", org.eclipse.wst.html.core;bundle-version="1.1.300", - org.eclipse.wst.html.ui;bundle-version="1.0.400", + org.eclipse.wst.html.ui;bundle-version="1.0.401", org.mozilla.xulrunner;bundle-version="1.9.1";resolution:=optional, - org.eclipse.core.resources;bundle-version="3.5.0", + org.eclipse.core.resources;bundle-version="3.5.1", org.eclipse.wst.css.core;bundle-version="1.1.300", - org.eclipse.wst.jsdt.core;bundle-version="1.0.200" + org.eclipse.wst.jsdt.core;bundle-version="1.0.201" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy diff -r 641b65b14318 -r 954dbf7baac6 org.symbian.tools.wrttools.editing/icons/obj16/refresh.gif Binary file org.symbian.tools.wrttools.editing/icons/obj16/refresh.gif has changed diff -r 641b65b14318 -r 954dbf7baac6 org.symbian.tools.wrttools.editing/icons/obj16/refresh_green.gif Binary file org.symbian.tools.wrttools.editing/icons/obj16/refresh_green.gif has changed diff -r 641b65b14318 -r 954dbf7baac6 org.symbian.tools.wrttools.editing/icons/obj16/refresh_red.gif Binary file org.symbian.tools.wrttools.editing/icons/obj16/refresh_red.gif has changed diff -r 641b65b14318 -r 954dbf7baac6 org.symbian.tools.wrttools.editing/plugin.xml --- a/org.symbian.tools.wrttools.editing/plugin.xml Wed Jan 20 16:51:26 2010 -0800 +++ b/org.symbian.tools.wrttools.editing/plugin.xml Wed Jan 20 18:00:15 2010 -0800 @@ -9,7 +9,7 @@ default="false" icon="icons/obj16/html-editor.gif" id="org.symbian.tools.wrttools.editing.editor2" - name="HTML Editor" + name="WRT HTML Editor" symbolicFontName="org.eclipse.wst.sse.ui.textfont"> @@ -19,7 +19,7 @@ + + + + + + + + + + + + diff -r 641b65b14318 -r 954dbf7baac6 org.symbian.tools.wrttools.editing/preferences.ini --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/org.symbian.tools.wrttools.editing/preferences.ini Wed Jan 20 18:00:15 2010 -0800 @@ -0,0 +1,1 @@ +preview.autorefresh=prompt \ No newline at end of file diff -r 641b65b14318 -r 954dbf7baac6 org.symbian.tools.wrttools.editing/src/org/symbian/tools/wrttools/editing/Activator.java --- a/org.symbian.tools.wrttools.editing/src/org/symbian/tools/wrttools/editing/Activator.java Wed Jan 20 16:51:26 2010 -0800 +++ b/org.symbian.tools.wrttools.editing/src/org/symbian/tools/wrttools/editing/Activator.java Wed Jan 20 18:00:15 2010 -0800 @@ -1,8 +1,9 @@ package org.symbian.tools.wrttools.editing; -import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.jface.resource.ImageRegistry; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.osgi.framework.BundleContext; @@ -32,10 +33,18 @@ plugin = this; } - /* - * (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) - */ + @Override + protected void initializeImageRegistry(ImageRegistry reg) { + addImage(reg, Images.GREEN_SYNC); + addImage(reg, Images.RED_SYNC); + addImage(reg, Images.YELLOW_SYNC); + } + + private void addImage(ImageRegistry reg, String path) { + ImageDescriptor imageDescriptor = imageDescriptorFromPlugin(PLUGIN_ID, path); + reg.put(path, imageDescriptor); + } + public void stop(BundleContext context) throws Exception { plugin = null; super.stop(context); @@ -50,7 +59,7 @@ return plugin; } - public static void log(CoreException e) { + public static void log(Exception e) { log(e.getLocalizedMessage(), e); } @@ -59,4 +68,7 @@ getDefault().getLog().log(status); } + public static ImageDescriptor getImageDescriptor(String id) { + return getDefault().getImageRegistry().getDescriptor(id); + } } diff -r 641b65b14318 -r 954dbf7baac6 org.symbian.tools.wrttools.editing/src/org/symbian/tools/wrttools/editing/IWrtEditingPreferences.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/org.symbian.tools.wrttools.editing/src/org/symbian/tools/wrttools/editing/IWrtEditingPreferences.java Wed Jan 20 18:00:15 2010 -0800 @@ -0,0 +1,5 @@ +package org.symbian.tools.wrttools.editing; + +public interface IWrtEditingPreferences { + String PREF_AUTO_REFRESH = "preview.autorefresh"; +} diff -r 641b65b14318 -r 954dbf7baac6 org.symbian.tools.wrttools.editing/src/org/symbian/tools/wrttools/editing/Images.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/org.symbian.tools.wrttools.editing/src/org/symbian/tools/wrttools/editing/Images.java Wed Jan 20 18:00:15 2010 -0800 @@ -0,0 +1,7 @@ +package org.symbian.tools.wrttools.editing; + +public interface Images { + String RED_SYNC = "/icons/obj16/refresh_red.gif"; + String YELLOW_SYNC = "/icons/obj16/refresh.gif"; + String GREEN_SYNC = "/icons/obj16/refresh_green.gif"; +} diff -r 641b65b14318 -r 954dbf7baac6 org.symbian.tools.wrttools.editing/src/org/symbian/tools/wrttools/editing/preferences/WrtEditingPreferencePage.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/org.symbian.tools.wrttools.editing/src/org/symbian/tools/wrttools/editing/preferences/WrtEditingPreferencePage.java Wed Jan 20 18:00:15 2010 -0800 @@ -0,0 +1,81 @@ +package org.symbian.tools.wrttools.editing.preferences; + +import org.eclipse.jface.dialogs.MessageDialogWithToggle; +import org.eclipse.jface.preference.FieldEditorPreferencePage; +import org.eclipse.jface.preference.RadioGroupFieldEditor; +import org.eclipse.swt.SWT; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.ui.IWorkbench; +import org.eclipse.ui.IWorkbenchPreferencePage; +import org.symbian.tools.wrttools.editing.Activator; +import org.symbian.tools.wrttools.editing.IWrtEditingPreferences; + +/** + * This class represents a preference page that + * is contributed to the Preferences dialog. By + * subclassing FieldEditorPreferencePage, we + * can use the field support built into JFace that allows + * us to create a page that is small and knows how to + * save, restore and apply itself. + *

+ * This page is used to modify preferences only. They + * are stored in the preference store that belongs to + * the main plug-in class. That way, preferences can + * be accessed directly via the preference store. + */ + +public class WrtEditingPreferencePage + extends FieldEditorPreferencePage + implements IWorkbenchPreferencePage { + + private RadioGroupFieldEditor enableAutorefresh; + + public WrtEditingPreferencePage() { + super(GRID); + setPreferenceStore(Activator.getDefault().getPreferenceStore()); + } + + /** + * Creates the field editors. Field editors are abstractions of + * the common GUI blocks needed to manipulate various types + * of preferences. Each field editor knows how to save and + * restore itself. + */ + public void createFieldEditors() { + Composite projectComposite = new Composite(getFieldEditorParent(), SWT.NONE); + projectComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + projectComposite.setFont(getFieldEditorParent().getFont()); + + String[][] namesAndValues = { + { "Enable", MessageDialogWithToggle.ALWAYS }, + { "Disable", MessageDialogWithToggle.NEVER }, + { "Prompt", MessageDialogWithToggle.PROMPT } }; + enableAutorefresh = new RadioGroupFieldEditor( + IWrtEditingPreferences.PREF_AUTO_REFRESH, + "Preview autorefresh for new WRT projects", + namesAndValues.length, namesAndValues, projectComposite, true); + enableAutorefresh.setPreferenceStore(getPreferenceStore()); + enableAutorefresh.setPage(this); + enableAutorefresh.load(); + addField(enableAutorefresh); + } + + /* (non-Javadoc) + * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench) + */ + public void init(IWorkbench workbench) { + } + +// @Override +// protected void performDefaults() { +// enableAutorefresh.loadDefault(); +// super.performDefaults(); +// } +// +// @Override +// public boolean performOk() { +// enableAutorefresh.store(); +// return super.performOk(); +// } +} \ No newline at end of file diff -r 641b65b14318 -r 954dbf7baac6 org.symbian.tools.wrttools.editing/src/org/symbian/tools/wrttools/editing/preview/PreviewPage.java --- a/org.symbian.tools.wrttools.editing/src/org/symbian/tools/wrttools/editing/preview/PreviewPage.java Wed Jan 20 16:51:26 2010 -0800 +++ b/org.symbian.tools.wrttools.editing/src/org/symbian/tools/wrttools/editing/preview/PreviewPage.java Wed Jan 20 18:00:15 2010 -0800 @@ -13,19 +13,23 @@ import org.eclipse.jface.action.Action; import org.eclipse.jface.action.IAction; import org.eclipse.jface.action.IToolBarManager; -import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jface.viewers.ISelectionChangedListener; +import org.eclipse.jface.viewers.ISelectionProvider; +import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.swt.SWT; import org.eclipse.swt.browser.Browser; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; -import org.eclipse.ui.ISharedImages; -import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.actions.ActionFactory; import org.eclipse.ui.part.IPageBookViewPage; import org.eclipse.ui.part.IPageSite; import org.eclipse.ui.part.Page; import org.osgi.framework.Bundle; +import org.symbian.tools.wrttools.editing.Activator; +import org.symbian.tools.wrttools.editing.Images; -public class PreviewPage extends Page implements IPageBookViewPage { +public class PreviewPage extends Page implements IPageBookViewPage, ISelectionProvider { private static final String XUL_RUNNER_PATH_PARAMETER = "org.eclipse.swt.browser.XULRunnerPath"; private final IAction refreshAction = new Action("Refresh") { @@ -42,14 +46,22 @@ private final IProject project; private Browser browser; private boolean toggleState = true; + private final PreviewView previewView; + private boolean needsRefresh = false; - public PreviewPage(IProject project) { + public PreviewPage(IProject project, PreviewView previewView) { this.project = project; + this.previewView = previewView; } protected void toggleRefresh() { toggleState = !toggleState; toggleRefresh.setChecked(toggleState); + previewView.setProjectAutorefresh(project, toggleState); + toggleRefresh.setToolTipText(getToggleActionTooltip()); + if (toggleState && needsRefresh) { + refresh(); + } } private synchronized void initMozilla() { @@ -95,20 +107,31 @@ public void setFocus() { browser.setFocus(); } + + private boolean refreshScheduled = false; - public void process(Collection files) { - if (needsRefresh(files)) { - getControl().getDisplay().asyncExec(new Runnable() { + public synchronized void process(Collection files) { + if (!refreshScheduled && needsRefresh(files)) { + asyncExec(new Runnable() { @Override public void run() { if (toggleState) { refresh(); + } else { + needsRefresh = true; + refreshAction.setImageDescriptor(Activator.getImageDescriptor(Images.RED_SYNC)); + refreshAction.setToolTipText("Refresh the preview browser (there are updated files)"); } } }); + refreshScheduled = true; } } + private void asyncExec(Runnable runnable) { + getControl().getDisplay().asyncExec(runnable); + } + private boolean needsRefresh(Collection files) { for (IFile iFile : files) { if (iFile.getProject().equals(project)) { @@ -118,24 +141,66 @@ return false; } - protected void refresh() { - browser.refresh(); + protected synchronized void refresh() { + try { + final Control focusControl = browser.getDisplay().getFocusControl(); + browser.refresh(); + refreshAction.setImageDescriptor(Activator + .getImageDescriptor(Images.GREEN_SYNC)); + asyncExec(new Runnable() { + @Override + public void run() { + focusControl.setFocus(); + } + }); + refreshAction.setToolTipText("Refresh the preview browser"); + needsRefresh = false; + } finally { + refreshScheduled = false; + } } @Override public void init(IPageSite pageSite) { super.init(pageSite); IToolBarManager toolBar = pageSite.getActionBars().getToolBarManager(); - ImageDescriptor image = PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(ISharedImages.IMG_ELCL_SYNCED); - refreshAction.setImageDescriptor(image); - refreshAction.setDescription("Refresh the preview browser"); + refreshAction.setImageDescriptor(Activator.getImageDescriptor(Images.GREEN_SYNC)); refreshAction.setToolTipText("Refresh the preview browser"); toolBar.add(refreshAction); - toggleRefresh.setImageDescriptor(image); - toggleRefresh.setDescription("Enable or disable automatic refresh"); - toggleRefresh.setToolTipText("Enable or disable automatic refresh"); + toggleState = previewView.getProjectAutorefresh(project); + + toggleRefresh.setImageDescriptor(Activator.getImageDescriptor(Images.YELLOW_SYNC)); + toggleRefresh.setToolTipText(getToggleActionTooltip()); toggleRefresh.setChecked(toggleState); toolBar.add(toggleRefresh); + + pageSite.getActionBars().setGlobalActionHandler(ActionFactory.REFRESH.getId(), refreshAction); + getSite().setSelectionProvider(this); + } + + private String getToggleActionTooltip() { + return toggleState ? "Disable preview autorefresh" : "Enable preview autorefresh"; + } + + @Override + public void addSelectionChangedListener(ISelectionChangedListener listener) { + // Do nothing + } + + @Override + public ISelection getSelection() { + return new StructuredSelection(project); + } + + @Override + public void removeSelectionChangedListener( + ISelectionChangedListener listener) { + // Do nothing + } + + @Override + public void setSelection(ISelection selection) { + // Do nothing } } diff -r 641b65b14318 -r 954dbf7baac6 org.symbian.tools.wrttools.editing/src/org/symbian/tools/wrttools/editing/preview/PreviewView.java --- a/org.symbian.tools.wrttools.editing/src/org/symbian/tools/wrttools/editing/preview/PreviewView.java Wed Jan 20 16:51:26 2010 -0800 +++ b/org.symbian.tools.wrttools.editing/src/org/symbian/tools/wrttools/editing/preview/PreviewView.java Wed Jan 20 18:00:15 2010 -0800 @@ -1,12 +1,18 @@ package org.symbian.tools.wrttools.editing.preview; -import java.util.Arrays; +import java.io.BufferedOutputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; import java.util.Collection; import java.util.HashMap; import java.util.HashSet; import java.util.Map; -import java.util.Set; -import java.util.TreeSet; +import java.util.Properties; +import java.util.Map.Entry; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; @@ -15,9 +21,12 @@ import org.eclipse.core.resources.IResourceChangeListener; import org.eclipse.core.resources.IResourceDelta; import org.eclipse.core.resources.IResourceDeltaVisitor; +import org.eclipse.core.resources.IWorkspaceRoot; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.content.IContentType; +import org.eclipse.jface.dialogs.IDialogConstants; +import org.eclipse.jface.dialogs.MessageDialogWithToggle; +import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.IWorkbenchPart; @@ -25,16 +34,14 @@ import org.eclipse.ui.part.MessagePage; import org.eclipse.ui.part.PageBook; import org.eclipse.ui.part.PageBookView; -import org.eclipse.wst.css.core.internal.provisional.contenttype.ContentTypeIdForCSS; -import org.eclipse.wst.html.core.internal.provisional.contenttype.ContentTypeIdForHTML; -import org.eclipse.wst.jsdt.core.JavaScriptCore; import org.symbian.tools.wrttools.editing.Activator; +import org.symbian.tools.wrttools.editing.IWrtEditingPreferences; public class PreviewView extends PageBookView { - private static final Set CONTENT_TYPES = new TreeSet(Arrays.asList(ContentTypeIdForCSS.ContentTypeID_CSS, ContentTypeIdForHTML.ContentTypeID_HTML, JavaScriptCore.JAVA_SOURCE_CONTENT_TYPE)); - - private static final class ChangedResourcesCollector implements IResourceDeltaVisitor { + private static final class ChangedResourcesCollector implements + IResourceDeltaVisitor { public final Collection files = new HashSet(); + @Override public boolean visit(IResourceDelta delta) throws CoreException { if (isRelevantResource(delta.getResource())) { @@ -43,7 +50,13 @@ return true; } } - + + public static boolean isRelevantResource(IResource resource) { + return resource.getType() == IResource.FILE + && !resource.getFullPath().segment(1).equalsIgnoreCase( + "preview"); + } + private final IResourceChangeListener resourceListener = new IResourceChangeListener() { @Override public void resourceChanged(IResourceChangeEvent event) { @@ -56,53 +69,50 @@ refreshPages(visitor.files); } }; - + private Map projectToPage = new HashMap(); - + private boolean preferencesLoaded = false; + private final Map autorefresh = new HashMap(); + @Override protected IPage createDefaultPage(PageBook book) { MessagePage messagePage = new MessagePage(); - messagePage.setMessage("Open editor to preview WRT widget"); + messagePage.setMessage("Open an editor to preview WRT widget"); + initPage(messagePage); + messagePage.createControl(book); return messagePage; } - protected void refreshPages(Collection files) { - Collection values = projectToPage.values(); - for (PreviewPage page : values) { - page.process(files); - } + @Override + public void createPartControl(Composite parent) { + super.createPartControl(parent); + ResourcesPlugin.getWorkspace().addResourceChangeListener( + resourceListener); } - public static boolean isRelevantResource(IResource resource) { - if (resource.getType() == IResource.FILE) { - IContentType contentType; - try { - contentType = ((IFile) resource).getContentDescription().getContentType(); - if (contentType != null) { - return CONTENT_TYPES.contains(contentType.getId()); - } - } catch (CoreException e) { - Activator.log(e); - } - } - return false; + @Override + public void dispose() { + ResourcesPlugin.getWorkspace().removeResourceChangeListener( + resourceListener); + super.dispose(); } @Override protected PageRec doCreatePage(IWorkbenchPart part) { // All checks we need were done in isImportant method - IResource resource = (IResource) ((IEditorPart) part).getEditorInput().getAdapter(IResource.class); - + IResource resource = (IResource) ((IEditorPart) part).getEditorInput() + .getAdapter(IResource.class); + IProject project = resource.getProject(); PreviewPage page = projectToPage.get(project); - + if (page == null) { - page = new PreviewPage(project); + page = new PreviewPage(project, this); initPage(page); page.createControl(getPageBook()); projectToPage.put(project, page); } - + return new PageRec(part, page); } @@ -122,10 +132,49 @@ return null; } + private boolean getDefaultAutorefresh(IProject project) { + IPreferenceStore preferenceStore = Activator.getDefault() + .getPreferenceStore(); + String value = preferenceStore + .getString(IWrtEditingPreferences.PREF_AUTO_REFRESH); + if (value == null || value.trim().length() == 0 || MessageDialogWithToggle.PROMPT.equals(value)) { + return MessageDialogWithToggle + .openYesNoQuestion( + getSite().getShell(), + "WRT Preview", + "WRT IDE can refresh preview whenever any changes are made to project files. Refresh will always return the widget to initial page. Do you want to enable automatic refresh for your project?\nNote: you can toggle this setting for particular project on the preview toolbar.", + "Keep this setting for all new projects", false, + preferenceStore, + IWrtEditingPreferences.PREF_AUTO_REFRESH) + .getReturnCode() == IDialogConstants.YES_ID; + } else { + return MessageDialogWithToggle.ALWAYS.equals(value); + } + } + + private File getPreferencesFile() { + return Activator.getDefault().getStateLocation().append( + "autorefreshState.xml").toFile(); + } + + public boolean getProjectAutorefresh(IProject project) { + synchronized (autorefresh) { + loadPreferences(); + if (autorefresh.containsKey(project)) { + return autorefresh.get(project); + } else { + boolean value = getDefaultAutorefresh(project); + setProjectAutorefresh(project, value); + return value; + } + } + } + @Override protected boolean isImportant(IWorkbenchPart part) { if (part instanceof IEditorPart) { - IResource resource = (IResource) ((IEditorPart) part).getEditorInput().getAdapter(IResource.class); + IResource resource = (IResource) ((IEditorPart) part) + .getEditorInput().getAdapter(IResource.class); if (resource != null) { return isWrtProject(resource.getProject()); } @@ -136,16 +185,77 @@ private boolean isWrtProject(IProject project) { return project.getFile("wrt_preview_frame.html").exists(); } - - @Override - public void createPartControl(Composite parent) { - super.createPartControl(parent); - ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceListener); + + private void loadPreferences() { + synchronized (autorefresh) { + if (preferencesLoaded) { + return; + } + preferencesLoaded = true; + File preferencesFile = getPreferencesFile(); + Properties properties = new Properties(); + if (preferencesFile.exists()) { + InputStream inputStream = null; + try { + inputStream = new FileInputStream(preferencesFile); + properties.loadFromXML(inputStream); + } catch (IOException e) { + Activator.log(e); + } finally { + if (inputStream != null) { + try { + inputStream.close(); + } catch (IOException e) { + Activator.log(e); + } + } + } + IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot(); + for (Entry entry : properties.entrySet()) { + String projectName = entry.getKey().toString(); + String value = entry.getValue().toString(); + IProject project = root.getProject(projectName); + if (project.exists()) { + autorefresh.put(project, Boolean.valueOf(value)); + } + } + } + } } - - @Override - public void dispose() { - ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceListener); - super.dispose(); + + protected void refreshPages(Collection files) { + Collection values = projectToPage.values(); + for (PreviewPage page : values) { + page.process(files); + } } + + public void setProjectAutorefresh(IProject project, boolean refresh) { + synchronized (autorefresh) { + autorefresh.put(project, refresh); + Properties properties = new Properties(); + for (Entry entry : autorefresh.entrySet()) { + properties.setProperty(entry.getKey().getName(), entry + .getValue().toString()); + } + File path = getPreferencesFile(); + OutputStream outputStream = null; + try { + outputStream = new BufferedOutputStream(new FileOutputStream( + path)); + properties.storeToXML(outputStream, null); + } catch (IOException e) { + Activator.log(e); + } finally { + if (outputStream != null) { + try { + outputStream.close(); + } catch (IOException e) { + Activator.log(e); + } + } + } + } + } + } diff -r 641b65b14318 -r 954dbf7baac6 org.symbian.tools.wrttools/META-INF/MANIFEST.MF --- a/org.symbian.tools.wrttools/META-INF/MANIFEST.MF Wed Jan 20 16:51:26 2010 -0800 +++ b/org.symbian.tools.wrttools/META-INF/MANIFEST.MF Wed Jan 20 18:00:15 2010 -0800 @@ -20,7 +20,9 @@ org.eclipse.ui.ide;bundle-version="3.5.0", org.eclipse.wst.validation;bundle-version="1.2.102", org.eclipse.wst.sse.core;bundle-version="1.1.400", - org.eclipse.wst.xml.core;bundle-version="1.1.400" + org.eclipse.wst.xml.core;bundle-version="1.1.400", + org.eclipse.ui.navigator;bundle-version="3.4.0", + org.eclipse.ui.navigator.resources;bundle-version="3.4.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Import-Package: org.apache.velocity;version="1.5.0", @@ -44,7 +46,6 @@ org.eclipse.emf.common.util, org.eclipse.emf.ecore, org.eclipse.emf.ecore.impl, - org.eclipse.jdt.ui, org.eclipse.ui.console, org.eclipse.ui.dialogs, org.eclipse.ui.ide, @@ -53,3 +54,4 @@ org.eclipse.ui.wizards.newresource Bundle-ClassPath: lib/tagsoup-1.2.jar, . +Export-Package: org.symbian.tools.wrttools.wizards diff -r 641b65b14318 -r 954dbf7baac6 org.symbian.tools.wrttools/plugin.xml --- a/org.symbian.tools.wrttools/plugin.xml Wed Jan 20 16:51:26 2010 -0800 +++ b/org.symbian.tools.wrttools/plugin.xml Wed Jan 20 18:00:15 2010 -0800 @@ -1,160 +1,384 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Creates a new Symbian WRT application project using one of the provided templates + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Creates a new Symbian WRT application project using one of the provided + templates + + + + + + + + + This wizard generates an empty widget project with a minimal Info.plist, html,css and js. - - - - - - - - This wizard generates an empty widget project with a minimal Info.plist, html,css and js. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 641b65b14318 -r 954dbf7baac6 org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/navigator/NavigatorSorter.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/navigator/NavigatorSorter.java Wed Jan 20 18:00:15 2010 -0800 @@ -0,0 +1,67 @@ +package org.symbian.tools.wrttools.navigator; + +import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.IAdaptable; +import org.eclipse.jface.viewers.Viewer; +import org.eclipse.jface.viewers.ViewerSorter; +import org.eclipse.wst.jsdt.core.IJavaScriptElement; +import org.eclipse.wst.jsdt.ui.JavaScriptElementComparator; + +public class NavigatorSorter extends ViewerSorter { + private final JavaScriptElementComparator jsComparator = new JavaScriptElementComparator(); + + @Override + public int compare(Viewer viewer, Object e1, Object e2) { + if (e1 == e2) { + return 0; + } else if (e1 == null) { + return 1; + } else if (e2 == null) { + return -1; + } + + if (e1 instanceof IJavaScriptElement && e2 instanceof IJavaScriptElement) { + return compareJavaScriptElements(viewer, (IJavaScriptElement) e1, (IJavaScriptElement) e2); + } + IResource res1 = getResource(e1); + IResource res2 = getResource(e2); + + if (res1 == res2) { + return 0; + } else if (res1 == null) { + return 1; + } else if (res2 == null) { + return -1; + } else { + int res1type = res1.getType(); + int res2type = res2.getType(); + if (res1type == res2type) { + // Note: Files cannot have same name in different case - enforced by Eclipse + return res1.getName().toLowerCase().compareTo(res2.getName().toLowerCase()); + } else if (res1type == IResource.PROJECT) { + return -1; + } else if (res1type == IResource.PROJECT) { + return 1; + } else if (res1type == IResource.FOLDER) { + return -1; + } else { + return 1; + } + } + } + + private IResource getResource(Object e1) { + if (e1 instanceof IResource) { + return (IResource) e1; + } else if (e1 instanceof IAdaptable) { + return (IResource) ((IAdaptable) e1).getAdapter(IResource.class); + } else { + return null; + } + } + + private int compareJavaScriptElements(Viewer viewer, IJavaScriptElement e1, IJavaScriptElement e2) { + return jsComparator.compare(viewer, e1, e2); + } + +} diff -r 641b65b14318 -r 954dbf7baac6 org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/navigator/WRTNavigatorContentProvider.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/navigator/WRTNavigatorContentProvider.java Wed Jan 20 18:00:15 2010 -0800 @@ -0,0 +1,137 @@ +package org.symbian.tools.wrttools.navigator; + +import java.util.Collection; +import java.util.Comparator; +import java.util.TreeSet; + +import org.eclipse.core.resources.IFolder; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.IWorkspace; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IAdaptable; +import org.eclipse.jface.viewers.ITreeContentProvider; +import org.eclipse.wst.jsdt.core.IJavaScriptElement; +import org.eclipse.wst.jsdt.core.IJavaScriptModel; +import org.eclipse.wst.jsdt.core.IJavaScriptProject; +import org.eclipse.wst.jsdt.core.JavaScriptCore; +import org.eclipse.wst.jsdt.core.JavaScriptModelException; +import org.eclipse.wst.jsdt.internal.ui.navigator.JavaNavigatorContentProvider; +import org.symbian.tools.wrttools.Activator; + +public class WRTNavigatorContentProvider extends JavaNavigatorContentProvider + implements ITreeContentProvider { + + private static final class TreeElementsComparator implements Comparator