# HG changeset patch # User Eugene Ostroukhov # Date 1267136769 28800 # Node ID 830136ec8316fd760bf27974acf623a6b2c83620 # Parent f02192d5e8f8fa696218283f4ab313824f8c7753# Parent 79af744d63ed2e6587429513506bca86c2dc1f4f Wizard can now import projects of any time (i.e. Dreamweaver, WRT IDE) from the filesystem diff -r f02192d5e8f8 -r 830136ec8316 org.symbian.tools.wrttools.previewer/preview/css/style.css --- a/org.symbian.tools.wrttools.previewer/preview/css/style.css Wed Feb 24 16:12:51 2010 -0800 +++ b/org.symbian.tools.wrttools.previewer/preview/css/style.css Thu Feb 25 14:26:09 2010 -0800 @@ -283,7 +283,7 @@ div#PreferencesBtn{ width: 75px; height: 85px; - background-image: url(../images/settings-icon.png); + background-image: url(../images/settings-icon.png); position: absolute; top: 10px; left: 10px; @@ -459,7 +459,7 @@ } div#event-memory{ - background-image: url(../images/memory-icon.png); + background-image: url(../images/memory-icon.png); } div.ui-panel{ diff -r f02192d5e8f8 -r 830136ec8316 org.symbian.tools.wrttools.previewer/preview/wrt_preview.html --- a/org.symbian.tools.wrttools.previewer/preview/wrt_preview.html Wed Feb 24 16:12:51 2010 -0800 +++ b/org.symbian.tools.wrttools.previewer/preview/wrt_preview.html Thu Feb 25 14:26:09 2010 -0800 @@ -209,10 +209,10 @@

diff -r f02192d5e8f8 -r 830136ec8316 org.symbian.tools.wrttools/plugin.xml --- a/org.symbian.tools.wrttools/plugin.xml Wed Feb 24 16:12:51 2010 -0800 +++ b/org.symbian.tools.wrttools/plugin.xml Thu Feb 25 14:26:09 2010 -0800 @@ -203,13 +203,6 @@ templates - - @@ -280,16 +273,16 @@ + name="WRT Project"> + name="Sources from WGZ File"> diff -r f02192d5e8f8 -r 830136ec8316 org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/deployer/IWidgetDeployer.java --- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/deployer/IWidgetDeployer.java Wed Feb 24 16:12:51 2010 -0800 +++ b/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/deployer/IWidgetDeployer.java Thu Feb 25 14:26:09 2010 -0800 @@ -1,13 +1,21 @@ -/* ============================================================================ - * Copyright © 2008 Nokia. All rights reserved. - * This material, including documentation and any related computer - * programs, is protected by copyright controlled by Nokia. All - * rights are reserved. Copying, including reproducing, storing, - * adapting or translating, any or all of this material requires the - * prior written consent of Nokia. This material also contains - * confidential information which may not be disclosed to others - * without the prior written consent of Nokia. - * ============================================================================*/ +/** + * Copyright (c) 2009 Symbian Foundation and/or its subsidiary(-ies). + * All rights reserved. + * This component and the accompanying materials are made available + * under the terms of the License "Eclipse Public License v1.0" + * which accompanies this distribution, and is available + * at the URL "http://www.eclipse.org/legal/epl-v10.html". + * + * Initial Contributors: + * Symbian Foundation - initial contribution. + * Contributors: + * Description: + * Overview: + * Details: + * Platforms/Drives/Compatibility: + * Assumptions/Requirement/Pre-requisites: + * Failures and causes: + */ package org.symbian.tools.wrttools.core.deployer; diff -r f02192d5e8f8 -r 830136ec8316 org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/deployer/WidgetDeployer.java --- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/deployer/WidgetDeployer.java Wed Feb 24 16:12:51 2010 -0800 +++ b/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/deployer/WidgetDeployer.java Thu Feb 25 14:26:09 2010 -0800 @@ -1,13 +1,21 @@ -/* ============================================================================ - * Copyright © 2008 Nokia. All rights reserved. - * This material, including documentation and any related computer - * programs, is protected by copyright controlled by Nokia. All - * rights are reserved. Copying, including reproducing, storing, - * adapting or translating, any or all of this material requires the - * prior written consent of Nokia. This material also contains - * confidential information which may not be disclosed to others - * without the prior written consent of Nokia. - * ============================================================================*/ +/** + * Copyright (c) 2009 Symbian Foundation and/or its subsidiary(-ies). + * All rights reserved. + * This component and the accompanying materials are made available + * under the terms of the License "Eclipse Public License v1.0" + * which accompanies this distribution, and is available + * at the URL "http://www.eclipse.org/legal/epl-v10.html". + * + * Initial Contributors: + * Symbian Foundation - initial contribution. + * Contributors: + * Description: + * Overview: + * Details: + * Platforms/Drives/Compatibility: + * Assumptions/Requirement/Pre-requisites: + * Failures and causes: + */ package org.symbian.tools.wrttools.core.deployer; diff -r f02192d5e8f8 -r 830136ec8316 org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/marker/WRTMarker.java --- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/marker/WRTMarker.java Wed Feb 24 16:12:51 2010 -0800 +++ b/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/marker/WRTMarker.java Thu Feb 25 14:26:09 2010 -0800 @@ -38,7 +38,7 @@ * WRTValidator problem marker type. This can be used to recognize those markers * in the workspace that flag problems detected by the CodeScanner plugin. */ - public static final String WRT_PROBLEM_MARKER = Activator.PLUGIN_ID + ".com.nokia.wrt.core.validator.marker"; //$NON-NLS-1$ + public static final String WRT_PROBLEM_MARKER = Activator.PLUGIN_ID + ".org.symbian.tools.wrttools.core.validator.marker"; //$NON-NLS-1$ // public static final String WRT_PROBLEM_MARKER = Activator.PLUGIN_ID + ".WRTMarker"; //$NON-NLS-1$ diff -r f02192d5e8f8 -r 830136ec8316 org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/packager/ExcludeFileAction.java --- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/packager/ExcludeFileAction.java Wed Feb 24 16:12:51 2010 -0800 +++ b/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/packager/ExcludeFileAction.java Thu Feb 25 14:26:09 2010 -0800 @@ -68,7 +68,7 @@ } } /*Refresh project tree when property is changed */ - PlatformUI.getWorkbench().getDecoratorManager().update("com.nokia.wrt.decorator"); + PlatformUI.getWorkbench().getDecoratorManager().update("org.symbian.tools.wrttools.decorator"); } public void selectionChanged(IAction action, ISelection selection) { diff -r f02192d5e8f8 -r 830136ec8316 org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/packager/IncludeFileAction.java --- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/packager/IncludeFileAction.java Wed Feb 24 16:12:51 2010 -0800 +++ b/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/packager/IncludeFileAction.java Thu Feb 25 14:26:09 2010 -0800 @@ -71,7 +71,7 @@ } } /*Refresh project tree when property is changed */ - PlatformUI.getWorkbench().getDecoratorManager().update("com.nokia.wrt.decorator"); + PlatformUI.getWorkbench().getDecoratorManager().update("org.symbian.tools.wrttools.decorator"); } /** diff -r f02192d5e8f8 -r 830136ec8316 org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/packager/PackagerZipFolder.java --- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/packager/PackagerZipFolder.java Wed Feb 24 16:12:51 2010 -0800 +++ b/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/packager/PackagerZipFolder.java Thu Feb 25 14:26:09 2010 -0800 @@ -40,8 +40,6 @@ //import org.apache.commons.io.IOUtils; -//import com.nokia.wrt.core.report.IMessageListener; -//import com.nokia.wrt.core.report.Message; import org.symbian.tools.wrttools.core.status.IWRTConstants; import org.symbian.tools.wrttools.core.status.IWRTStatusListener; import org.symbian.tools.wrttools.core.status.WRTStatus; diff -r f02192d5e8f8 -r 830136ec8316 org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/packager/WRTPackagerConstants.java --- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/packager/WRTPackagerConstants.java Wed Feb 24 16:12:51 2010 -0800 +++ b/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/packager/WRTPackagerConstants.java Thu Feb 25 14:26:09 2010 -0800 @@ -23,7 +23,7 @@ public class WRTPackagerConstants { - public static QualifiedName EXCLUDE_PROPERTY = new QualifiedName("com.nokia.wrt.packager", "exclude"); + public static QualifiedName EXCLUDE_PROPERTY = new QualifiedName("org.symbian.tools.wrttools.core.packager", "exclude"); public static String STA_PKG_PASSED = PackagerMessages.getString("WRTPackagerConstants.success"); //$NON-NLS-1$ diff -r f02192d5e8f8 -r 830136ec8316 org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/report/IMessageListener.java --- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/report/IMessageListener.java Wed Feb 24 16:12:51 2010 -0800 +++ b/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/report/IMessageListener.java Thu Feb 25 14:26:09 2010 -0800 @@ -1,13 +1,21 @@ -/* ============================================================================ - * Copyright © 2008 Nokia. All rights reserved. - * This material, including documentation and any related computer - * programs, is protected by copyright controlled by Nokia. All - * rights are reserved. Copying, including reproducing, storing, - * adapting or translating, any or all of this material requires the - * prior written consent of Nokia. This material also contains - * confidential information which may not be disclosed to others - * without the prior written consent of Nokia. - * ============================================================================*/ +/** + * Copyright (c) 2009 Symbian Foundation and/or its subsidiary(-ies). + * All rights reserved. + * This component and the accompanying materials are made available + * under the terms of the License "Eclipse Public License v1.0" + * which accompanies this distribution, and is available + * at the URL "http://www.eclipse.org/legal/epl-v10.html". + * + * Initial Contributors: + * Symbian Foundation - initial contribution. + * Contributors: + * Description: + * Overview: + * Details: + * Platforms/Drives/Compatibility: + * Assumptions/Requirement/Pre-requisites: + * Failures and causes: + */ package org.symbian.tools.wrttools.core.report; diff -r f02192d5e8f8 -r 830136ec8316 org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/report/messages.properties --- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/report/messages.properties Wed Feb 24 16:12:51 2010 -0800 +++ b/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/report/messages.properties Thu Feb 25 14:26:09 2010 -0800 @@ -1,7 +1,7 @@ HtmlReportHandler.convert.title=Dashboard widget conversion report -HtmlReportHandler.convert.description=Automatic conversions performed by the converter to match Nokia Web Runtime. +HtmlReportHandler.convert.description=Automatic conversions performed by the converter to match Web Runtime. HtmlReportHandler.analysis.report.title=Dashboard widget analysis report -HtmlReportHandler.analysis.report.description=This analysis report lists the mandatory or optional conversions needed to port the widget to Nokia Web Runtime. +HtmlReportHandler.analysis.report.description=This analysis report lists the mandatory or optional conversions needed to port the widget to Web Runtime. HtmlReportHandler.file.name=File name HtmlReportHandler.line.number=Line number HtmlReportHandler.convert.action.needed=Action needed diff -r f02192d5e8f8 -r 830136ec8316 org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/status/IWRTConstants.java --- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/status/IWRTConstants.java Wed Feb 24 16:12:51 2010 -0800 +++ b/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/status/IWRTConstants.java Thu Feb 25 14:26:09 2010 -0800 @@ -74,11 +74,11 @@ /** * Locally stored Nokia DTD */ - public static String NOKIA_PLIST_DTD = "/com/nokia/wrt/core/widgetmodel/plist-1.0.dtd"; + public static String NOKIA_PLIST_DTD = "/org/symbian/tools/wrttools/core/widgetmodel/plist-1.0.dtd"; /** * Locally stored Apple DTD */ - public static String APPLE_PLIST_DTD = "/com/nokia/wrt/core/converter/PropertyList-1.0.dtd"; +// public static String APPLE_PLIST_DTD = "/com/nokia/wrt/core/converter/PropertyList-1.0.dtd"; /** * Nokia DTD in nfo.plist file */ diff -r f02192d5e8f8 -r 830136ec8316 org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/validator/WidgetValidator.java --- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/validator/WidgetValidator.java Wed Feb 24 16:12:51 2010 -0800 +++ b/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/validator/WidgetValidator.java Thu Feb 25 14:26:09 2010 -0800 @@ -54,7 +54,7 @@ * .plist - This file will be parsed to verify for the Nokia specific DTD * * 1. DisplayName - display name should exist - * 2. Identifier - value should be of com.nokia. ** + * 2. Identifier - value should be of org.symbian.tools.wrttools. ** * 3. MainHTML - value should be same as the .html file name * * diff -r f02192d5e8f8 -r 830136ec8316 org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/widgetmodel/WidgetModel.java --- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/widgetmodel/WidgetModel.java Wed Feb 24 16:12:51 2010 -0800 +++ b/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/widgetmodel/WidgetModel.java Thu Feb 25 14:26:09 2010 -0800 @@ -1272,20 +1272,7 @@ try { showData(" ############################################################################################################################# "); model.getWidgetModel( "C:/ModelTest/Flickr"); -// model.getWidgetModel( "C:/ModelTest/HelloWorld"); -// model.getWidgetModel( "C:/ModelTest/mFootyAmazonPedia.wdgt"); - -// model.getWidgetModel( "C:/ModelTest/mFooty"); -// model.getWidgetModel( "C:/ModelTest/NokiaRSS"); -// model.getWidgetModel( "C:/ModelTest/Widgets/bmi"); -// model.getWidgetModel( "C:/ModelTest/blink"); -// model.getWidgetModel( "C:/ModelTest/Gmail"); -// model.getWidgetModel( "C:/ModelTest/MOSH"); -// model.getWidgetModel( "C:/ModelTest/AmazonPedia.wdgt"); -// model.getWidgetModel( "C:/ModelTest/UniversalDecider"); -// model.getWidgetModel( "d:/ModelTest/Beep"); -// model.getWidgetModel( "C:/ModelTest/blankPlist"); -// model.getWidgetModel( "C:/ModelTest/AmazonPedia.wdgt"); + /** List fileNames=null; FileUtil filehelper = new FileUtil(); diff -r f02192d5e8f8 -r 830136ec8316 org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/sdt/utils/DefaultMessageListener.java --- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/sdt/utils/DefaultMessageListener.java Wed Feb 24 16:12:51 2010 -0800 +++ b/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/sdt/utils/DefaultMessageListener.java Thu Feb 25 14:26:09 2010 -0800 @@ -32,7 +32,7 @@ /* (non-Javadoc) - * @see com.nokia.sdt.utils.IMessageListener#isHandlingMessage(com.nokia.sdt.utils.IMessage) + * @see org.symbian.tools.wrttools.sdt.utils.IMessageListener#isHandlingMessage(org.symbian.tools.wrttools.sdt.utils.IMessage) */ public boolean isHandlingMessage(IMessage msg) { // in case this gets added as a MessageReporting listener diff -r f02192d5e8f8 -r 830136ec8316 org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/sdt/utils/Logging.java --- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/sdt/utils/Logging.java Wed Feb 24 16:12:51 2010 -0800 +++ b/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/sdt/utils/Logging.java Thu Feb 25 14:26:09 2010 -0800 @@ -269,7 +269,7 @@ * @param option * The debug option to test. The plugin's symbolic name is * prepended to the option name, e.g. - * "com.nokia.myplugin"+"/"+option + * "org.symbian.tools.wrttools.myplugin"+"/"+option * @return true if debugging enabled and option enabled (e.g. defined and * set to "true") */ @@ -325,7 +325,7 @@ * the calling plugin, or null * @param option * the debug option to test. The plugin name is prepended to the - * option name, e.g. "com.nokia.myplugin"+"/"+option + * option name, e.g. "org.symbian.tools.wrttools.myplugin"+"/"+option * @param status * the status object * @see Logging#isDebugOptionEnabled(Plugin, String) diff -r f02192d5e8f8 -r 830136ec8316 org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/sdt/utils/Message.java --- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/sdt/utils/Message.java Wed Feb 24 16:12:51 2010 -0800 +++ b/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/sdt/utils/Message.java Thu Feb 25 14:26:09 2010 -0800 @@ -146,56 +146,56 @@ } /* (non-Javadoc) - * @see com.nokia.sdt.component.sourcegen.ISourceGenProblem#getSeverity() + * @see org.symbian.tools.wrttools.sdt.component.sourcegen.ISourceGenProblem#getSeverity() */ public int getSeverity() { return severity; } /* (non-Javadoc) - * @see com.nokia.sdt.utils.IMessage#getMessageLocation() + * @see org.symbian.tools.wrttools.sdt.utils.IMessage#getMessageLocation() */ public MessageLocation getMessageLocation() { return ref; } /* (non-Javadoc) - * @see com.nokia.sdt.utils.IMessage#getLocation() + * @see org.symbian.tools.wrttools.sdt.utils.IMessage#getLocation() */ public IPath getLocation() { return ref != null ? ref.getLocation() : null; } /* (non-Javadoc) - * @see com.nokia.sdt.utils.IMessage#getPath() + * @see org.symbian.tools.wrttools.sdt.utils.IMessage#getPath() */ public IPath getPath() { return ref != null ? ref.getPath() : null; } /* (non-Javadoc) - * @see com.nokia.sdt.component.sourcegen.ISourceGenProblem#getLineNumber() + * @see org.symbian.tools.wrttools.sdt.component.sourcegen.ISourceGenProblem#getLineNumber() */ public int getLineNumber() { return ref != null ? ref.lineNumber : -1; } /* (non-Javadoc) - * @see com.nokia.sdt.sourcegen.ISourceGenMessage#getColumnNumber() + * @see org.symbian.tools.wrttools.sdt.sourcegen.ISourceGenMessage#getColumnNumber() */ public int getColumnNumber() { return ref != null ? ref.columnNumber : -1; } /* (non-Javadoc) - * @see com.nokia.sdt.component.sourcegen.ISourceGenProblem#getMessage() + * @see org.symbian.tools.wrttools.sdt.component.sourcegen.ISourceGenProblem#getMessage() */ public String getMessage() { return text; } /* (non-Javadoc) - * @see com.nokia.sdt.component.sourcegen.ISourceGenProblem#getMessageKey() + * @see org.symbian.tools.wrttools.sdt.component.sourcegen.ISourceGenProblem#getMessageKey() */ public String getMessageKey() { return key; diff -r f02192d5e8f8 -r 830136ec8316 org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/sdt/utils/noexport/Messages.java --- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/sdt/utils/noexport/Messages.java Wed Feb 24 16:12:51 2010 -0800 +++ b/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/sdt/utils/noexport/Messages.java Thu Feb 25 14:26:09 2010 -0800 @@ -27,7 +27,7 @@ * */ public class Messages { - private static final String BUNDLE_NAME = "com.nokia.sdt.utils.noexport.messages";//$NON-NLS-1$ + private static final String BUNDLE_NAME = "org.symbian.tools.wrttools.sdt.utils.noexport.messages";//$NON-NLS-1$ private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle .getBundle(BUNDLE_NAME); diff -r f02192d5e8f8 -r 830136ec8316 org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/util/CoreUtil.java --- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/util/CoreUtil.java Wed Feb 24 16:12:51 2010 -0800 +++ b/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/util/CoreUtil.java Thu Feb 25 14:26:09 2010 -0800 @@ -2,8 +2,8 @@ import java.io.BufferedReader; import java.io.IOException; -import java.io.InputStream; import java.io.InputStreamReader; +import java.io.Reader; import java.text.MessageFormat; import java.util.HashMap; import java.util.Map; @@ -47,6 +47,16 @@ return null; } + public static String getApplicationName(String buffer) { + if (buffer != null) { + Matcher matcher = getPropertyLookupPattern("DisplayName").matcher(buffer); + if (matcher.find()) { + return matcher.group(1); + } + } + return null; + } + public static Pattern getPropertyLookupPattern(String propertyName) { return Pattern.compile(MessageFormat.format(PROPERTY_PATTERN, propertyName), Pattern.CASE_INSENSITIVE); } @@ -77,20 +87,9 @@ throws CoreException { try { if (file != null && file.isAccessible()) { - InputStream contents = file.getContents(); final BufferedReader reader = new BufferedReader( - new InputStreamReader(contents, file.getCharset())); - StringBuffer buffer = new StringBuffer(); - try { - int c = 0; - char[] buf = new char[4096]; - while ((c = reader.read(buf)) > 0) { - buffer.append(buf, 0, c); - } - return buffer.toString(); - } finally { - reader.close(); - } + new InputStreamReader(file.getContents(), file.getCharset())); + return read(reader); } return null; } catch (IOException e) { @@ -98,6 +97,20 @@ } } + public static String read(final Reader reader) throws IOException { + StringBuffer buffer = new StringBuffer(); + try { + int c = 0; + char[] buf = new char[4096]; + while ((c = reader.read(buf)) > 0) { + buffer.append(buf, 0, c); + } + return buffer.toString(); + } finally { + reader.close(); + } + } + private static final Map INDEX_FILES = new HashMap(); public static synchronized String getIndexFile(IProject project) throws CoreException { diff -r f02192d5e8f8 -r 830136ec8316 org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/util/ProjectUtils.java --- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/util/ProjectUtils.java Wed Feb 24 16:12:51 2010 -0800 +++ b/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/util/ProjectUtils.java Thu Feb 25 14:26:09 2010 -0800 @@ -23,8 +23,12 @@ import java.io.IOException; import java.net.URI; import java.text.MessageFormat; +import java.util.Arrays; import java.util.Collection; import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.TreeSet; import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; @@ -55,9 +59,9 @@ import org.eclipse.ui.IViewReference; import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.IWorkbenchPart; -import org.eclipse.ui.MultiPartInitException; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.ide.IDE; +import org.eclipse.ui.internal.wizards.datatransfer.TarEntry; import org.eclipse.ui.part.ISetSelectionTarget; import org.eclipse.wst.jsdt.core.JavaScriptCore; import org.eclipse.wst.jsdt.internal.ui.wizards.buildpaths.BuildPathsBlock; @@ -67,216 +71,10 @@ @SuppressWarnings("restriction") public class ProjectUtils { - private static final String DEFAULT_APTANA_WORKSPACE = "Aptana Studio Workspace"; - public static final String PREVIEW_FOLDER = "preview"; - public static final String PREVIEW_FRAME_FILE = "wrt_preview_frame.html"; - public static final String PREVIEW_MAIN_FILE = "wrt_preview_main.html"; - - private static boolean isDefaultProjectLocation(URI uri) { - if (uri == null) { - return true; - } - File file = new File(uri); - IPath project = new Path(file.getAbsolutePath()); - IPath workspace = ResourcesPlugin.getWorkspace().getRoot() - .getLocation(); - return workspace.isPrefixOf(project); - } - - public static IProject createWrtProject(String name, URI uri, - IProgressMonitor monitor) throws CoreException { - uri = isDefaultProjectLocation(uri) ? null : uri; - monitor.beginTask("Create project resources", 20); - IWorkspace workspace = ResourcesPlugin.getWorkspace(); - IProject project = workspace.getRoot().getProject(name); - BuildPathsBlock.createProject(project, uri, new SubProgressMonitor( - monitor, 10)); - BuildPathsBlock.addJavaNature(project, new SubProgressMonitor(monitor, - 10)); - - ValidationFramework.getDefault().addValidationBuilder(project); - ValidationFramework.getDefault().applyChanges( - ValidationFramework.getDefault().getProjectSettings(project), - true); - - // TODO: Build path, super type, etc. - // BuildPathsBlock.flush(classPathEntries, javaScriptProject, superType, - // monitor) - - addWrtNature(project); - - monitor.done(); - return project; - } - - public static void addWrtNature(IProject project) { - if (!hasWrtNature(project)) { - try { - IProjectDescription description = project.getDescription(); - String[] natureIds = description.getNatureIds(); - String[] newNatures = new String[natureIds.length + 1]; - System.arraycopy(natureIds, 0, newNatures, 1, natureIds.length); - newNatures[0] = WidgetProjectNature.ID; - description.setNatureIds(newNatures); - - ICommand[] buildSpec = description.getBuildSpec(); - for (int i = 0; i < buildSpec.length; i++) { - ICommand command = buildSpec[i]; - if (JavaScriptCore.BUILDER_ID.equals(command - .getBuilderName())) { - buildSpec[i] = buildSpec[buildSpec.length - 1]; - buildSpec[buildSpec.length - 1] = command; - description.setBuildSpec(buildSpec); - break; - } - } - - project.setDescription(description, new NullProgressMonitor()); - } catch (CoreException e) { - Activator.log(e); - } - } - } - - public static boolean hasWrtNature(IProject project) { - try { - return project.hasNature(WidgetProjectNature.ID); - } catch (CoreException e) { - Activator.log(e); - return false; - } - } - - public static String getDefaultAptanaLocation() { - File myDocuments = FileSystemView.getFileSystemView() - .getDefaultDirectory(); - File file = new File(myDocuments, DEFAULT_APTANA_WORKSPACE); // Windows - if (file.exists()) { - return file.getAbsolutePath(); - } - file = new File(myDocuments, "Documents" + File.separator - + DEFAULT_APTANA_WORKSPACE); // Mac OS X - if (file.exists()) { - return file.getAbsolutePath(); - } - return ""; - } - - public static boolean isAptanaProject(File f) { - return new File(f, PREVIEW_FOLDER).isDirectory() - && new File(f, PREVIEW_FRAME_FILE).isFile(); - } - - public static void copyFile(IProject project, String name, - ZipInputStream stream, long size, IProgressMonitor monitor) - throws CoreException, IOException { - IFile file = project.getFile(name); - file.create(new NonClosingStream(stream), true, new SubProgressMonitor( - monitor, 1)); - } - - public static boolean isAptanaProject(URI locationURI) { - return isAptanaProject(new File(locationURI)); - } - - public static File isAptanaProject(File[] contents) { - File dotProjectFile = null; - boolean hasPreviewer = false; - boolean hasFrame = false; - - for (int i = 0; i < contents.length; i++) { - File file = contents[i]; - if (file.isFile() - && file.getName().equals( - IProjectDescription.DESCRIPTION_FILE_NAME)) { - dotProjectFile = file; - } - if (file.isFile() - && PREVIEW_FRAME_FILE.equalsIgnoreCase(file.getName())) { - hasFrame = true; - } - if (file.isDirectory() - && PREVIEW_FOLDER.equalsIgnoreCase(file.getName())) { - hasPreviewer = true; - } - } - if (!(hasFrame && hasPreviewer)) { - dotProjectFile = null; - } - return dotProjectFile; - } - - public static void unzip(String archiveFile, IContainer location, - int trimSegments, IProgressMonitor progressMonitor) - throws IOException, CoreException { - progressMonitor.beginTask(MessageFormat.format("Unpacking {0}", - archiveFile), IProgressMonitor.UNKNOWN); - ZipInputStream stream = new ZipInputStream(new FileInputStream( - archiveFile)); - - try { - ZipEntry nextEntry; - while ((nextEntry = stream.getNextEntry()) != null) { - IPath p = new Path(nextEntry.getName()) - .removeFirstSegments(trimSegments); - if (!nextEntry.isDirectory()) { - IFile file = location.getFile(p); - checkParent(file.getParent()); - file.create(new NonClosingStream(stream), false, - new SubProgressMonitor(progressMonitor, 1)); - } - } - } finally { - stream.close(); - } - progressMonitor.done(); - } - - private static void checkParent(IContainer parent) throws CoreException { - if (parent.getType() == IResource.FOLDER && !parent.exists()) { - checkParent(parent.getParent()); - ((IFolder) parent).create(false, true, new NullProgressMonitor()); - } - } - - public static boolean isPlist(IResource resource) { - return resource.getType() == IResource.FILE - && resource.getName().equalsIgnoreCase("info.plist"); - } - - public static void focusOn(IProject... projects) { - new FocusOnProjectJob(projects, Display.getCurrent()).schedule(50); - } - - private static final class TouchAllResources implements IWorkspaceRunnable { - private final IProject[] projects; - - public TouchAllResources(IProject[] projects) { - this.projects = projects; - - } - - public void run(IProgressMonitor monitor) throws CoreException { - for (IProject project : projects) { - project.accept(new IResourceVisitor() { - public boolean visit(IResource resource) - throws CoreException { - if (resource.isAccessible() - && resource.getType() == IResource.FILE - && resource.getFileExtension().equals("js")) { - resource.touch(new NullProgressMonitor()); - } - return true; - } - }); - } - } - } - private static final class FocusOnProjectJob extends Job { + private final Display display; private final IProject[] projects; - private final Display display; public FocusOnProjectJob(IProject[] projects, Display display) { super("Preparing projects"); @@ -338,4 +136,220 @@ return Status.OK_STATUS; } } + private static final class TouchAllResources implements IWorkspaceRunnable { + private final IProject[] projects; + + public TouchAllResources(IProject[] projects) { + this.projects = projects; + + } + + public void run(IProgressMonitor monitor) throws CoreException { + for (IProject project : projects) { + project.accept(new IResourceVisitor() { + public boolean visit(IResource resource) + throws CoreException { + if (resource.isAccessible() + && resource.getType() == IResource.FILE + && resource.getFileExtension().equals("js")) { + resource.touch(new NullProgressMonitor()); + } + return true; + } + }); + } + } + } + private static final String DEFAULT_APTANA_WORKSPACE = "Aptana Studio Workspace"; + private static final Collection EXCLUDED; + + public static final String PREVIEW_FOLDER = "preview"; + + public static final String PREVIEW_FRAME_FILE = "wrt_preview_frame.html"; + + public static final String PREVIEW_MAIN_FILE = "wrt_preview_main.html"; + + static { + EXCLUDED = new TreeSet(Arrays.asList(".project", ProjectUtils.PREVIEW_FOLDER, + ProjectUtils.PREVIEW_FRAME_FILE, ProjectUtils.PREVIEW_MAIN_FILE)); + } + + private static boolean accepted(Object object) { + final String name; + if (object instanceof ZipEntry) { + name = ((ZipEntry) object).getName(); + } else if (object instanceof TarEntry) { + name = ((TarEntry) object).getName(); + } else if (object instanceof File) { + name = ((File) object).getAbsolutePath(); + } else { + throw new IllegalArgumentException("Unforeseen entry type: " + object.getClass()); + } + IPath path = new Path(name); + return isValidProjectFile(path.lastSegment()); + } + + public static void addWrtNature(IProject project) { + if (!hasWrtNature(project)) { + try { + IProjectDescription description = project.getDescription(); + String[] natureIds = description.getNatureIds(); + String[] newNatures = new String[natureIds.length + 1]; + System.arraycopy(natureIds, 0, newNatures, 1, natureIds.length); + newNatures[0] = WidgetProjectNature.ID; + description.setNatureIds(newNatures); + + ICommand[] buildSpec = description.getBuildSpec(); + for (int i = 0; i < buildSpec.length; i++) { + ICommand command = buildSpec[i]; + if (JavaScriptCore.BUILDER_ID.equals(command + .getBuilderName())) { + buildSpec[i] = buildSpec[buildSpec.length - 1]; + buildSpec[buildSpec.length - 1] = command; + description.setBuildSpec(buildSpec); + break; + } + } + + project.setDescription(description, new NullProgressMonitor()); + } catch (CoreException e) { + Activator.log(e); + } + } + } + + private static void checkParent(IContainer parent) throws CoreException { + if (parent.getType() == IResource.FOLDER && !parent.exists()) { + checkParent(parent.getParent()); + ((IFolder) parent).create(false, true, new NullProgressMonitor()); + } + } + + public static void copyFile(IProject project, String name, + ZipInputStream stream, long size, IProgressMonitor monitor) + throws CoreException, IOException { + IFile file = project.getFile(name); + file.create(new NonClosingStream(stream), true, new SubProgressMonitor( + monitor, 1)); + } + + public static IProject createWrtProject(String name, URI uri, + IProgressMonitor monitor) throws CoreException { + uri = isDefaultProjectLocation(uri) ? null : uri; + monitor.beginTask("Create project resources", 20); + IWorkspace workspace = ResourcesPlugin.getWorkspace(); + IProject project = workspace.getRoot().getProject(name); + BuildPathsBlock.createProject(project, uri, new SubProgressMonitor( + monitor, 10)); + BuildPathsBlock.addJavaNature(project, new SubProgressMonitor(monitor, + 10)); + + ValidationFramework.getDefault().addValidationBuilder(project); + ValidationFramework.getDefault().applyChanges( + ValidationFramework.getDefault().getProjectSettings(project), + true); + + // TODO: Build path, super type, etc. + // BuildPathsBlock.flush(classPathEntries, javaScriptProject, superType, + // monitor) + + addWrtNature(project); + + monitor.done(); + return project; + } + + public static List