diff options
5 files changed, 39 insertions, 29 deletions
diff --git a/org.eclipse.mylyn.help.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.help.ui/META-INF/MANIFEST.MF index 859dded88..fccdc77c6 100644 --- a/org.eclipse.mylyn.help.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.mylyn.help.ui/META-INF/MANIFEST.MF @@ -1,10 +1,10 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: Mylyn Help +Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.mylyn.help.ui;singleton:=true Bundle-Version: 3.1.0.qualifier Bundle-ActivationPolicy: lazy -Bundle-Vendor: Eclipse.org +Bundle-Vendor: %Bundle-Vendor Require-Bundle: org.eclipse.core.runtime, org.eclipse.ui, org.eclipse.ui.forms, @@ -14,3 +14,4 @@ Require-Bundle: org.eclipse.core.runtime, org.apache.ant;bundle-version="1.7.0";resolution:=optional Bundle-RequiredExecutionEnvironment: J2SE-1.5 Export-Package: org.eclipse.mylyn.internal.help.ui.anttask;x-internal:=true +Bundle-Localization: plugin diff --git a/org.eclipse.mylyn.help.ui/build.properties b/org.eclipse.mylyn.help.ui/build.properties index 7198487da..450ffed46 100644 --- a/org.eclipse.mylyn.help.ui/build.properties +++ b/org.eclipse.mylyn.help.ui/build.properties @@ -15,7 +15,8 @@ bin.includes = plugin.xml,\ images/,\ cheatsheets/,\ toc.xml,\ - userguide/ + userguide/,\ + plugin.properties src.includes = about.html source.. = src/ jars.compile.order = . diff --git a/org.eclipse.mylyn.help.ui/plugin.properties b/org.eclipse.mylyn.help.ui/plugin.properties new file mode 100644 index 000000000..252dac4fe --- /dev/null +++ b/org.eclipse.mylyn.help.ui/plugin.properties @@ -0,0 +1,9 @@ +#Properties file for org.eclipse.mylyn.help.ui +Bundle-Vendor = Eclipse.org +Bundle-Name = Mylyn Help + +cheatsheet.category.name = Tasks +cheatsheet.query.name = Create a task repository query +cheatsheet.query.description = Learn how to work with task and queries using the Task List +cheatsheet.taskfocus.name = Work with task context +cheatsheet.taskfocus.description = Learn how to activate tasks and use the Task-Focused UI diff --git a/org.eclipse.mylyn.help.ui/plugin.xml b/org.eclipse.mylyn.help.ui/plugin.xml index 76e798e41..ea13adf6f 100644 --- a/org.eclipse.mylyn.help.ui/plugin.xml +++ b/org.eclipse.mylyn.help.ui/plugin.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <?eclipse version="3.0"?> -<?eclipse version="3.0"?> <plugin> <extension id="org.eclipse.mylyn.helpDocs" @@ -20,39 +19,39 @@ point="org.eclipse.ui.intro.configExtension"> <configExtension configId="org.eclipse.ui.intro.universalConfig" - content="intro/overviewExtensionContent.xml"> + content="$nl$/intro/overviewExtensionContent.xml"> </configExtension> <configExtension configId="org.eclipse.ui.intro.universalConfig" - content="intro/whatsnewExtensionContent.xml"> + content="$nl$/intro/whatsnewExtensionContent.xml"> </configExtension> <configExtension configId="org.eclipse.ui.intro.universalConfig" - content="intro/tutorialsExtensionContent.xml"> + content="$nl$/intro/tutorialsExtensionContent.xml"> </configExtension> </extension> <extension point="org.eclipse.ui.cheatsheets.cheatSheetContent"> <category id="org.eclipse.mylyn.cheatsheet" - name="Tasks"> + name="%cheatsheet.category.name"> </category> <cheatsheet category="org.eclipse.mylyn.cheatsheet" - contentFile="cheatsheets/Query.xml" + contentFile="$nl$/cheatsheets/Query.xml" id="org.eclipse.mylyn.cheatsheet.query" - name="Create a task repository query"> + name="%cheatsheet.query.name"> <description> - Learn how to work with task and queries using the Task List + %cheatsheet.query.description </description> </cheatsheet> <cheatsheet category="org.eclipse.mylyn.cheatsheet" - contentFile="cheatsheets/TaskFocus.xml" + contentFile="$nl$/cheatsheets/TaskFocus.xml" id="org.eclipse.mylyn.cheatsheet.taskfocus" - name="Work with task context"> + name="%cheatsheet.taskfocus.name"> <description> - Learn how to activate tasks and use the Task-Focused UI + %cheatsheet.taskfocus.description </description> </cheatsheet> </extension> diff --git a/org.eclipse.mylyn.help.ui/src/org/eclipse/mylyn/internal/help/ui/anttask/MediaWikiImageFetcher.java b/org.eclipse.mylyn.help.ui/src/org/eclipse/mylyn/internal/help/ui/anttask/MediaWikiImageFetcher.java index 257c1b0e1..8726b813b 100644 --- a/org.eclipse.mylyn.help.ui/src/org/eclipse/mylyn/internal/help/ui/anttask/MediaWikiImageFetcher.java +++ b/org.eclipse.mylyn.help.ui/src/org/eclipse/mylyn/internal/help/ui/anttask/MediaWikiImageFetcher.java @@ -42,38 +42,38 @@ public class MediaWikiImageFetcher extends Task { @Override public void execute() throws BuildException { if (dest == null) { - throw new BuildException("Must specify @dest"); + throw new BuildException("Must specify @dest"); //$NON-NLS-1$ } if (!dest.exists()) { - throw new BuildException("@dest does not exist: " + dest); + throw new BuildException("@dest does not exist: " + dest); //$NON-NLS-1$ } if (!dest.isDirectory()) { - throw new BuildException("@dest is not a directory: " + dest); + throw new BuildException("@dest is not a directory: " + dest); //$NON-NLS-1$ } if (src == null) { - throw new BuildException("Must specify @src"); + throw new BuildException("Must specify @src"); //$NON-NLS-1$ } if (!src.exists()) { - throw new BuildException("@src does not exist: " + src); + throw new BuildException("@src does not exist: " + src); //$NON-NLS-1$ } if (!src.isFile()) { - throw new BuildException("@src is not a file: " + src); + throw new BuildException("@src is not a file: " + src); //$NON-NLS-1$ } if (base == null) { - throw new BuildException("Must specify @base"); + throw new BuildException("Must specify @base"); //$NON-NLS-1$ } - if (base.endsWith("/")) { + if (base.endsWith("/")) { //$NON-NLS-1$ base = base.substring(0, base.length() - 1); } - Pattern fragmentUrlPattern = Pattern.compile("src=\"([^\"]+)\""); - Pattern imagePattern = Pattern.compile("alt=\"Image:([^\"]*)\"([^>]+)", Pattern.MULTILINE); + Pattern fragmentUrlPattern = Pattern.compile("src=\"([^\"]+)\""); //$NON-NLS-1$ + Pattern imagePattern = Pattern.compile("alt=\"Image:([^\"]*)\"([^>]+)", Pattern.MULTILINE); //$NON-NLS-1$ String htmlSrc; try { htmlSrc = readSrc(); } catch (IOException e) { - throw new BuildException("Cannot read src: " + src + ": " + e.getMessage(), e); + throw new BuildException("Cannot read src: " + src + ": " + e.getMessage(), e); //$NON-NLS-1$ //$NON-NLS-2$ } - log("Parsing " + src, Project.MSG_INFO); + log("Parsing " + src, Project.MSG_INFO); //$NON-NLS-1$ int fileCount = 0; Matcher imagePatternMatcher = imagePattern.matcher(htmlSrc); while (imagePatternMatcher.find()) { @@ -84,14 +84,14 @@ public class MediaWikiImageFetcher extends Task { if (fragmentUrlMatcher.find()) { String url = fragmentUrlMatcher.group(1); String qualifiedUrl = base + url; - log("Fetching " + qualifiedUrl, Project.MSG_INFO); + log("Fetching " + qualifiedUrl, Project.MSG_INFO); //$NON-NLS-1$ Get get = new Get(); get.setProject(getProject()); get.setLocation(getLocation()); try { get.setSrc(new URL(qualifiedUrl)); } catch (MalformedURLException e) { - log("Skipping " + url + ": " + e.getMessage(), Project.MSG_WARN); + log("Skipping " + url + ": " + e.getMessage(), Project.MSG_WARN); //$NON-NLS-1$ //$NON-NLS-2$ continue; } // note: we use the alt text for the name since for some files there is a case-difference between @@ -103,7 +103,7 @@ public class MediaWikiImageFetcher extends Task { } } } - log("Fetched " + fileCount + " image files for " + src, Project.MSG_INFO); + log("Fetched " + fileCount + " image files for " + src, Project.MSG_INFO); //$NON-NLS-1$ //$NON-NLS-2$ } public String getBase() { |