$NON-NLS-1$

12 files changed, 46 insertions, 49 deletions

diff --git a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/IIntroConstants.java b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/IIntroConstants.java
index a46cca281..1d9451717 100644
--- a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/IIntroConstants.java
+++ b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/IIntroConstants.java
@@ -8,7 +8,6 @@
  ******************************************************************************/
 package org.eclipse.ui.internal.intro.impl;
 
-
 public interface IIntroConstants {
 
     // all attributes here are by default public static final.
@@ -30,7 +29,6 @@ public interface IIntroConstants {
     String MEMENTO_STANDBY_CONTENT_PART_ID_ATT = "contentPartID"; //$NON-NLS-1$
     String MEMENTO_STANDBY_CONTENT_PART_TAG = "standbyContentPart"; //$NON-NLS-1$
 
-
     // Form implementation consts:
     // ---------------------------
     // key to retrieve the into link model object from imageHyperlink widget.
@@ -40,5 +38,4 @@ public interface IIntroConstants {
     // key to retrive page sub-title from PageContentForm
     String PAGE_SUBTITLE = "PageSubtitle"; //$NON-NLS-1$
 
-
 }
\ No newline at end of file
diff --git a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/model/IntroModelRoot.java b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/model/IntroModelRoot.java
index d5b669bcc..571c088d8 100644
--- a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/model/IntroModelRoot.java
+++ b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/model/IntroModelRoot.java
@@ -458,7 +458,7 @@ public class IntroModelRoot extends AbstractIntroContainer {
             // not a page. Test for root page.
             if (!pageId.equals(homePage.getId())) {
                 // not a page nor the home page.
-                Log.warning("Could not find Intro page with id: " + pageId);
+                Log.warning("Could not find Intro page with id: " + pageId); //$NON-NLS-1$
                 return false;
             }
         }
diff --git a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/parts/EmptyStandbyContentPart.java b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/parts/EmptyStandbyContentPart.java
index 74cdf098d..182894c7c 100644
--- a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/parts/EmptyStandbyContentPart.java
+++ b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/parts/EmptyStandbyContentPart.java
@@ -34,7 +34,7 @@ public class EmptyStandbyContentPart implements IStandbyContentPart {
     public void createPartControl(Composite parent, FormToolkit toolkit) {
         contentComposite = toolkit.createComposite(parent);
         contentComposite.setLayout(new GridLayout());
-        String text = IntroPlugin.getString("EmptyStandbyContentPart.text");
+        String text = IntroPlugin.getString("EmptyStandbyContentPart.text"); //$NON-NLS-1$
         Label label = toolkit.createLabel(contentComposite, text, SWT.NULL);
         label.setFont(PageStyleManager.getDefaultFont());
         GridData gd = new GridData(GridData.FILL_HORIZONTAL);
diff --git a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/parts/StandbyPart.java b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/parts/StandbyPart.java
index f44b6fc4a..f44667b96 100644
--- a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/parts/StandbyPart.java
+++ b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/parts/StandbyPart.java
@@ -128,7 +128,7 @@ public class StandbyPart implements IIntroConstants {
         container.setLayout(new StandbyLayout());
 
         // return hyper link.
-        ImageUtil.registerImage(ImageUtil.BACK, "full/elcl16/home_nav.gif");
+        ImageUtil.registerImage(ImageUtil.BACK, "full/elcl16/home_nav.gif"); //$NON-NLS-1$
         returnLink = toolkit.createImageHyperlink(container, SWT.WRAP);
         returnLink.setImage(ImageUtil.getImage(ImageUtil.BACK));
         returnLink.addHyperlinkListener(new HyperlinkAdapter() {
@@ -209,8 +209,8 @@ public class StandbyPart implements IIntroConstants {
                         setInput(input);
                         return true;
                     } catch (Exception e) {
-                        Log.error("Failed to set the input: " + input
-                                + " on standby part: " + partId, e);
+                        Log.error("Failed to set the input: " + input //$NON-NLS-1$
+                                + " on standby part: " + partId, e); //$NON-NLS-1$
                         return false;
                     }
                 }
diff --git a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/presentations/BrowserIntroPartImplementation.java b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/presentations/BrowserIntroPartImplementation.java
index f53887c61..79fd6ceee 100644
--- a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/presentations/BrowserIntroPartImplementation.java
+++ b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/presentations/BrowserIntroPartImplementation.java
@@ -41,7 +41,7 @@ public class BrowserIntroPartImplementation extends
             setImageDescriptor(ImageUtil
                     .createImageDescriptor("full/elcl16/backward_nav.gif")); //$NON-NLS-1$
             setDisabledImageDescriptor(ImageUtil
-                    .createImageDescriptor("full/dlcl16/backward_nav.gif"));
+                    .createImageDescriptor("full/dlcl16/backward_nav.gif")); //$NON-NLS-1$
         }
 
         public void run() {
@@ -72,7 +72,7 @@ public class BrowserIntroPartImplementation extends
             setImageDescriptor(ImageUtil
                     .createImageDescriptor("full/elcl16/forward_nav.gif")); //$NON-NLS-1$
             setDisabledImageDescriptor(ImageUtil
-                    .createImageDescriptor("full/dlcl16/forward_nav.gif"));
+                    .createImageDescriptor("full/dlcl16/forward_nav.gif")); //$NON-NLS-1$
         }
 
         public void run() {
@@ -99,11 +99,11 @@ public class BrowserIntroPartImplementation extends
     private Action homeAction = new Action() {
 
         {
-            setToolTipText(IntroPlugin.getString("Browser.homeButton_tooltip"));
+            setToolTipText(IntroPlugin.getString("Browser.homeButton_tooltip")); //$NON-NLS-1$
             setImageDescriptor(ImageUtil
-                    .createImageDescriptor("full/elcl16/home_nav.gif"));
+                    .createImageDescriptor("full/elcl16/home_nav.gif")); //$NON-NLS-1$
             setDisabledImageDescriptor(ImageUtil
-                    .createImageDescriptor("full/dlcl16/home_nav.gif"));
+                    .createImageDescriptor("full/dlcl16/home_nav.gif")); //$NON-NLS-1$
         }
 
         public void run() {
@@ -156,7 +156,7 @@ public class BrowserIntroPartImplementation extends
             }
 
             public void completed(ProgressEvent event) {
-                browser.setData("frameNavigation", null);
+                browser.setData("frameNavigation", null); //$NON-NLS-1$
             }
         });
 
@@ -199,7 +199,7 @@ public class BrowserIntroPartImplementation extends
                 // set the URL the browser should display
                 boolean success = browser.setUrl(cachedPage);
                 if (!success) {
-                    Log.error("Unable to set the following ULR in browser: "
+                    Log.error("Unable to set the following ULR in browser: " //$NON-NLS-1$
                             + cachedPage, null);
                     return;
                 }
diff --git a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/presentations/BrowserIntroPartLocationListener.java b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/presentations/BrowserIntroPartLocationListener.java
index a995c13b1..11fe3a87b 100644
--- a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/presentations/BrowserIntroPartLocationListener.java
+++ b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/presentations/BrowserIntroPartLocationListener.java
@@ -63,8 +63,8 @@ public class BrowserIntroPartLocationListener implements LocationListener {
             // cleared by a progress listener, when all the frame navigation is
             // completed.
             Browser browser = (Browser) event.getSource();
-            if (browser.getData("frameNavigation") == null) {
-                browser.setData("frameNavigation", "true");
+            if (browser.getData("frameNavigation") == null) { //$NON-NLS-1$
+                browser.setData("frameNavigation", "true"); //$NON-NLS-1$ //$NON-NLS-2$
                 implementation.updateHistory(url);
             }
         }
diff --git a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/presentations/FormIntroPartImplementation.java b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/presentations/FormIntroPartImplementation.java
index 5b92e4f93..ccc62faa2 100644
--- a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/presentations/FormIntroPartImplementation.java
+++ b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/presentations/FormIntroPartImplementation.java
@@ -56,7 +56,7 @@ public class FormIntroPartImplementation extends
             setImageDescriptor(ImageUtil
                     .createImageDescriptor("full/elcl16/backward_nav.gif")); //$NON-NLS-1$
             setDisabledImageDescriptor(ImageUtil
-                    .createImageDescriptor("full/dlcl16/backward_nav.gif"));
+                    .createImageDescriptor("full/dlcl16/backward_nav.gif")); //$NON-NLS-1$
         }
 
         public void run() {
@@ -84,7 +84,7 @@ public class FormIntroPartImplementation extends
             setImageDescriptor(ImageUtil
                     .createImageDescriptor("full/elcl16/forward_nav.gif")); //$NON-NLS-1$
             setDisabledImageDescriptor(ImageUtil
-                    .createImageDescriptor("full/dlcl16/forward_nav.gif"));
+                    .createImageDescriptor("full/dlcl16/forward_nav.gif")); //$NON-NLS-1$
         }
 
         public void run() {
@@ -107,11 +107,11 @@ public class FormIntroPartImplementation extends
     private Action homeAction = new Action() {
 
         {
-            setToolTipText(IntroPlugin.getString("Browser.homeButton_tooltip"));
+            setToolTipText(IntroPlugin.getString("Browser.homeButton_tooltip")); //$NON-NLS-1$
             setImageDescriptor(ImageUtil
-                    .createImageDescriptor("full/elcl16/home_nav.gif"));
+                    .createImageDescriptor("full/elcl16/home_nav.gif")); //$NON-NLS-1$
             setDisabledImageDescriptor(ImageUtil
-                    .createImageDescriptor("full/dlcl16/home_nav.gif"));
+                    .createImageDescriptor("full/dlcl16/home_nav.gif")); //$NON-NLS-1$
         }
 
         public void run() {
@@ -185,7 +185,7 @@ public class FormIntroPartImplementation extends
             mainForm.setBackgroundImage(bgImage);
             String repeat = sharedStyleManager
                     .getProperty("title.image.repeat"); //$NON-NLS-1$
-            if (repeat != null && repeat.equalsIgnoreCase("true"))
+            if (repeat != null && repeat.equalsIgnoreCase("true")) //$NON-NLS-1$
 
                 mainForm.setBackgroundImageTiled(true);
         }
diff --git a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/swt/PageStyleManager.java b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/swt/PageStyleManager.java
index 214b88b72..e70fbd4fc 100644
--- a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/swt/PageStyleManager.java
+++ b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/swt/PageStyleManager.java
@@ -122,36 +122,36 @@ public class PageStyleManager extends SharedStyleManager {
      * default is 1.
      */
     public int getPageNumberOfColumns() {
-        return getIntProperty(page, ".layout.ncolumns", 0);
+        return getIntProperty(page, ".layout.ncolumns", 0); //$NON-NLS-1$
     }
 
 
     public int getNumberOfColumns(IntroGroup group) {
-        return getIntProperty(group, ".layout.ncolumns", 0);
+        return getIntProperty(group, ".layout.ncolumns", 0); //$NON-NLS-1$
     }
 
     public int getPageVerticalSpacing() {
-        return getIntProperty(page, ".layout.vspacing", 5);
+        return getIntProperty(page, ".layout.vspacing", 5); //$NON-NLS-1$
     }
 
     public int getVerticalSpacing(IntroGroup group) {
-        return getIntProperty(group, ".layout.vspacing", 5);
+        return getIntProperty(group, ".layout.vspacing", 5); //$NON-NLS-1$
     }
 
     public int getPageHorizantalSpacing() {
-        return getIntProperty(page, ".layout.hspacing", 5);
+        return getIntProperty(page, ".layout.hspacing", 5); //$NON-NLS-1$
     }
 
     public int getHorizantalSpacing(IntroGroup group) {
-        return getIntProperty(group, ".layout.hspacing", 5);
+        return getIntProperty(group, ".layout.hspacing", 5); //$NON-NLS-1$
     }
 
     public int getColSpan(AbstractBaseIntroElement element) {
-        return getIntProperty(element, ".layout.colspan", 1);
+        return getIntProperty(element, ".layout.colspan", 1); //$NON-NLS-1$
     }
 
     public int getRowSpan(AbstractBaseIntroElement element) {
-        return getIntProperty(element, ".layout.rowspan", 1);
+        return getIntProperty(element, ".layout.rowspan", 1); //$NON-NLS-1$
     }
 
     private int getIntProperty(AbstractBaseIntroElement element,
@@ -324,15 +324,15 @@ public class PageStyleManager extends SharedStyleManager {
         String value = null;
         StringBuffer buff = createPathToElementKey(text);
         if (buff != null) {
-            String key = buff.append(".font.bold").toString();
+            String key = buff.append(".font.bold").toString(); //$NON-NLS-1$
             value = getProperty(key);
             if (value != null)
-                return value.toLowerCase().equals("true");
+                return value.toLowerCase().equals("true"); //$NON-NLS-1$
         }
         if (value == null) {
             // bold is not specified by ID. Check to see if there is a style-id
             // specified for bold.
-            value = getProperty("bold-style-id");
+            value = getProperty("bold-style-id"); //$NON-NLS-1$
             if (value != null && text.getStyleId() != null)
                 return text.getStyleId().equals(value);
         }
diff --git a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/swt/PageWidgetFactory.java b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/swt/PageWidgetFactory.java
index 750257d0c..3f071be32 100644
--- a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/swt/PageWidgetFactory.java
+++ b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/swt/PageWidgetFactory.java
@@ -118,10 +118,10 @@ public class PageWidgetFactory {
                     break;
                 String linkText = StringUtil
                         .concat(
-                                "<p><a href=\"http://org.eclipse.ui.intro/openBrowser?url=",
-                                embddedLink, "\">",
-                                IntroPlugin.getString("HTML.embeddedLink"),
-                                "</a></p>").toString();
+                                "<p><a href=\"http://org.eclipse.ui.intro/openBrowser?url=", //$NON-NLS-1$
+                                embddedLink, "\">", //$NON-NLS-1$
+                                IntroPlugin.getString("HTML.embeddedLink"), //$NON-NLS-1$
+                                "</a></p>").toString(); //$NON-NLS-1$
                 linkText = generateFormText(linkText);
                 c = createFormText(parent, linkText, null);
             }
@@ -323,12 +323,12 @@ public class PageWidgetFactory {
     private String generateFormText(String text) {
         StringBuffer sbuf = new StringBuffer();
         sbuf.append("<form>"); //$NON-NLS-1$
-        if (text.startsWith("<p>"))
+        if (text.startsWith("<p>")) //$NON-NLS-1$
             sbuf.append(text);
         else {
-            sbuf.append("<p>");
+            sbuf.append("<p>"); //$NON-NLS-1$
             sbuf.append(text);
-            sbuf.append("</p>");
+            sbuf.append("</p>"); //$NON-NLS-1$
         }
         sbuf.append("</form>"); //$NON-NLS-1$
         return sbuf.toString();
@@ -343,11 +343,11 @@ public class PageWidgetFactory {
     private String generateBoldFormText(String text) {
         StringBuffer sbuf = new StringBuffer();
         sbuf.append("<form>"); //$NON-NLS-1$
-        sbuf.append("<p>");
-        sbuf.append("<b>");
+        sbuf.append("<p>"); //$NON-NLS-1$
+        sbuf.append("<b>"); //$NON-NLS-1$
         sbuf.append(text);
-        sbuf.append("</b>");
-        sbuf.append("</p>");
+        sbuf.append("</b>"); //$NON-NLS-1$
+        sbuf.append("</p>"); //$NON-NLS-1$
         sbuf.append("</form>"); //$NON-NLS-1$
         return sbuf.toString();
     }
diff --git a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/swt/RootPageForm.java b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/swt/RootPageForm.java
index 5ff20c6a3..174e19bc0 100644
--- a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/swt/RootPageForm.java
+++ b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/swt/RootPageForm.java
@@ -124,7 +124,7 @@ public class RootPageForm implements IIntroConstants {
 
         private void updateDescription(String text) {
             if (text == null)
-                text = "";
+                text = ""; //$NON-NLS-1$
             descriptionLabel.setText(text);
             descriptionLabel.getParent().layout();
         }
@@ -294,7 +294,7 @@ public class RootPageForm implements IIntroConstants {
      */
     private Label createHoverLabel(Composite body) {
         Label label = toolkit.createLabel(body, "", SWT.WRAP); //$NON-NLS-1$
-        String key = StringUtil.concat(rootPage.getId(), ".", "hover-text.fg")
+        String key = StringUtil.concat(rootPage.getId(), ".", "hover-text.fg") //$NON-NLS-1$ //$NON-NLS-2$
                 .toString();
         Color fg = rootPageStyleManager.getColor(toolkit, key);
         if (fg == null)
diff --git a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/util/Util.java b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/util/Util.java
index 5b59c6f66..ec7ea8893 100644
--- a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/util/Util.java
+++ b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/util/Util.java
@@ -301,7 +301,7 @@ public class Util {
 
             public void run() {
                 DialogUtil.displayErrorMessage(display.getActiveShell(),
-                        IntroPlugin.getString("OpenBroswer.failedToLaunch"), e);
+                        IntroPlugin.getString("OpenBroswer.failedToLaunch"), e); //$NON-NLS-1$
             }
         });
     }
diff --git a/org.eclipse.ui.intro/src/org/eclipse/ui/intro/config/CustomizableIntroPart.java b/org.eclipse.ui.intro/src/org/eclipse/ui/intro/config/CustomizableIntroPart.java
index 8475e074a..e82af9657 100644
--- a/org.eclipse.ui.intro/src/org/eclipse/ui/intro/config/CustomizableIntroPart.java
+++ b/org.eclipse.ui.intro/src/org/eclipse/ui/intro/config/CustomizableIntroPart.java
@@ -122,7 +122,7 @@ public final class CustomizableIntroPart extends IntroPart implements
 
         if (model == null || !model.hasValidConfig())
             DialogUtil.displayErrorMessage(site.getShell(),
-                    "CustomizableIntroPart.configNotFound",
+                    "CustomizableIntroPart.configNotFound", //$NON-NLS-1$
                     new Object[] { ModelLoaderUtil.getLogString(
                             getConfigurationElement(), null) }, null);