[272193] [UI] Externalize Strings (Net4j)

https://bugs.eclipse.org/bugs/show_bug.cgi?id=272193
author: Victor Roldan Betancort 2009-05-20 17:26:22 +0000
committer: Victor Roldan Betancort 2009-05-20 17:26:22 +0000
commit: 0a979565f2cce67cf15709444f0a93e189a5194b (patch)
tree: de5969b4ae8a883d5c10b4e2adc9521ea9842b5c
parent: e41897fe84a47ccdb34156c4ac05b64049fed458 (diff)
download: cdo-0a979565f2cce67cf15709444f0a93e189a5194b.tar.gz
cdo-0a979565f2cce67cf15709444f0a93e189a5194b.tar.xz
cdo-0a979565f2cce67cf15709444f0a93e189a5194b.zip
142 files changed, 499 insertions, 378 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server.db/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.server.db/META-INF/MANIFEST.MF
index 8106afd1fb..231f20d8b4 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.server.db/META-INF/MANIFEST.MF
@@ -18,4 +18,5 @@ Export-Package: org.eclipse.emf.cdo.server.db;version="2.0.0",
  org.eclipse.emf.cdo.server.internal.db.bundle;version="2.0.0";x-internal:=true,
  org.eclipse.emf.cdo.server.internal.db.jdbc;version="2.0.0";x-friends:="org.eclipse.emf.cdo.tests,org.eclipse.emf.cdo.tests.db",
  org.eclipse.emf.cdo.server.internal.db.mapping;version="2.0.0";x-friends:="org.eclipse.emf.cdo.tests,org.eclipse.emf.cdo.tests.db",
- org.eclipse.emf.cdo.server.internal.db.mapping.horizontal;version="2.0.0";x-friends:="org.eclipse.emf.cdo.tests,org.eclipse.emf.cdo.tests.db"
+ org.eclipse.emf.cdo.server.internal.db.mapping.horizontal;version="2.0.0";x-friends:="org.eclipse.emf.cdo.tests,org.eclipse.emf.cdo.tests.db",
+ org.eclipse.emf.cdo.server.internal.db.messages;x-internal:=true
diff --git a/plugins/org.eclipse.emf.cdo.server/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.server/META-INF/MANIFEST.MF
index 3c8fb4c0eb..da4a3c808e 100644
--- a/plugins/org.eclipse.emf.cdo.server/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.server/META-INF/MANIFEST.MF
@@ -14,6 +14,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)";resoluti
 Export-Package: org.eclipse.emf.cdo.internal.server;version="2.0.0";x-friends:="org.eclipse.emf.cdo.tests,org.eclipse.emf.cdo.server.db",
  org.eclipse.emf.cdo.internal.server.bundle;version="2.0.0";x-internal:=true,
  org.eclipse.emf.cdo.internal.server.mem;version="2.0.0";x-friends:="org.eclipse.emf.cdo.tests",
+ org.eclipse.emf.cdo.internal.server.messages;x-internal:=true,
  org.eclipse.emf.cdo.internal.server.protocol;version="2.0.0";x-friends:="org.eclipse.emf.cdo.tests",
  org.eclipse.emf.cdo.server;version="2.0.0",
  org.eclipse.emf.cdo.server.mem;version="2.0.0",
diff --git a/plugins/org.eclipse.net4j.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.ui/META-INF/MANIFEST.MF
index be7c271000..8439fd6125 100644
--- a/plugins/org.eclipse.net4j.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.ui/META-INF/MANIFEST.MF
@@ -14,4 +14,5 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.net4j.util.ui;bundle-version="[1.0.0,3.0.0)";visibility:=reexport
 Export-Package: org.eclipse.net4j.internal.ui;version="2.0.0";x-friends:="org.eclipse.net4j.ui.defs",
  org.eclipse.net4j.internal.ui.bundle;version="2.0.0";x-internal:=true,
+ org.eclipse.net4j.internal.ui.messages;x-internal:=true,
  org.eclipse.net4j.internal.ui.views;version="2.0.0";x-friends:="org.eclipse.net4j.ui.defs"
diff --git a/plugins/org.eclipse.net4j.util.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.util.ui/META-INF/MANIFEST.MF
index 39f93599fb..805738ea4e 100644
--- a/plugins/org.eclipse.net4j.util.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.util.ui/META-INF/MANIFEST.MF
@@ -15,6 +15,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
 Export-Package: org.eclipse.net4j.util.internal.ui;version="2.0.0";x-internal:=true,
  org.eclipse.net4j.util.internal.ui.actions;version="2.0.0";x-internal:=true,
  org.eclipse.net4j.util.internal.ui.bundle;version="2.0.0";x-internal:=true,
+ org.eclipse.net4j.util.internal.ui.messages;x-internal:=true,
  org.eclipse.net4j.util.internal.ui.views;version="2.0.0";x-internal:=true,
  org.eclipse.net4j.util.ui;version="2.0.0",
  org.eclipse.net4j.util.ui.actions;version="2.0.0",
diff --git a/plugins/org.eclipse.net4j.util.ui/plugin.properties b/plugins/org.eclipse.net4j.util.ui/plugin.properties
index a0a22dee7a..6eeaaf596d 100644
--- a/plugins/org.eclipse.net4j.util.ui/plugin.properties
+++ b/plugins/org.eclipse.net4j.util.ui/plugin.properties
@@ -23,3 +23,7 @@ providerName = Eclipse Modeling Project
 # %%% END OF TRANSLATED PROPERTIES %%%
 # The above properties have been shipped for translation.
 # ==============================================================================
+
+category.name = Net4j Debug
+view.name = Container
+view.name.0 = Introspector
+\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.util.ui/plugin.xml b/plugins/org.eclipse.net4j.util.ui/plugin.xml
index 45bb6a8c64..a1106944dc 100644
--- a/plugins/org.eclipse.net4j.util.ui/plugin.xml
+++ b/plugins/org.eclipse.net4j.util.ui/plugin.xml
@@ -17,19 +17,19 @@
          point="org.eclipse.ui.views">
       <category
             id="org.eclipse.net4j.debug"
-            name="Net4j Debug">
+            name="%category.name">
       </category>
       <view
             category="org.eclipse.net4j.debug"
             id="org.eclipse.net4j.util.Net4jContainerView"
             class="org.eclipse.net4j.util.internal.ui.views.Net4jContainerView"
-            name="Container"
+            name="%view.name"
             icon="icons/full/view16/container.gif"/>
       <view
             category="org.eclipse.net4j.debug"
             id="org.eclipse.net4j.util.Net4jIntrospectorView"
             class="org.eclipse.net4j.util.internal.ui.views.Net4jIntrospectorView"
-            name="Introspector"
+            name="%view.name.0"
             icon="icons/full/view16/javabean.gif"/>
    </extension>
    
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/SharedIcons.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/SharedIcons.java
index b7f0c56162..4ac25e4bb2 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/SharedIcons.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/SharedIcons.java
@@ -25,27 +25,27 @@ public class SharedIcons
 {
   private static final ImageRegistry REGISTRY = new ImageRegistry(getDisplay());
 
-  private static final String TOOL = "etool16/";
+  private static final String TOOL = "etool16/"; //$NON-NLS-1$
 
-  private static final String OBJ = "obj16/";
+  private static final String OBJ = "obj16/"; //$NON-NLS-1$
 
-  private static final String VIEW = "view16/";
+  private static final String VIEW = "view16/"; //$NON-NLS-1$
 
-  public static final String OBJ_ADAPTER = OBJ + "adapter";
+  public static final String OBJ_ADAPTER = OBJ + "adapter"; //$NON-NLS-1$
 
-  public static final String OBJ_FACTORY = OBJ + "factory";
+  public static final String OBJ_FACTORY = OBJ + "factory"; //$NON-NLS-1$
 
-  public static final String OBJ_FOLDER = OBJ + "folder";
+  public static final String OBJ_FOLDER = OBJ + "folder"; //$NON-NLS-1$
 
-  public static final String OBJ_BEAN = OBJ + "javabean";
+  public static final String OBJ_BEAN = OBJ + "javabean"; //$NON-NLS-1$
 
-  public static final String VIEW_CONTAINER = VIEW + "container";
+  public static final String VIEW_CONTAINER = VIEW + "container"; //$NON-NLS-1$
 
-  public static final String TOOL_ADD = TOOL + "add";
+  public static final String TOOL_ADD = TOOL + "add"; //$NON-NLS-1$
 
-  public static final String TOOL_DELETE = TOOL + "delete";
+  public static final String TOOL_DELETE = TOOL + "delete"; //$NON-NLS-1$
 
-  public static final String TOOL_REFRESH = TOOL + "refresh";
+  public static final String TOOL_REFRESH = TOOL + "refresh"; //$NON-NLS-1$
 
   public static Image getImage(String key)
   {
@@ -93,7 +93,7 @@ public class SharedIcons
 
     if (display == null)
     {
-      throw new IllegalStateException("display == null");
+      throw new IllegalStateException("display == null"); //$NON-NLS-1$
     }
 
     return display;
@@ -101,6 +101,6 @@ public class SharedIcons
 
   private static String mangleKey(String key)
   {
-    return "icons/full/" + key + ".gif";
+    return "icons/full/" + key + ".gif"; //$NON-NLS-1$ //$NON-NLS-2$
   }
 }
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/actions/IntrospectAction.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/actions/IntrospectAction.java
index 053c1920b9..eff15262bd 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/actions/IntrospectAction.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/actions/IntrospectAction.java
@@ -10,6 +10,7 @@
  */
 package org.eclipse.net4j.util.internal.ui.actions;
 
+import org.eclipse.net4j.util.internal.ui.messages.Messages;
 import org.eclipse.net4j.util.internal.ui.views.Net4jIntrospectorView;
 import org.eclipse.net4j.util.ui.actions.SafeAction;
 
@@ -22,7 +23,7 @@ public class IntrospectAction extends SafeAction
 
   public IntrospectAction(Object object)
   {
-    super("Introspect");
+    super(Messages.getString("IntrospectAction_0")); //$NON-NLS-1$
     this.object = object;
   }
 
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/messages/Messages.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/messages/Messages.java
new file mode 100644
index 0000000000..95b68fe2d7
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/messages/Messages.java
@@ -0,0 +1,41 @@
+/**
+ * Copyright (c) 2004 - 2009 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *    Victor Roldan Betancort - initial API and implementation
+ *    Eike Stepper            - maintenance
+ */
+package org.eclipse.net4j.util.internal.ui.messages;
+
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+/**
+ * @author Victor Roldan Betancort
+ */
+public class Messages
+{
+  private static final String BUNDLE_NAME = "org.eclipse.net4j.util.internal.ui.messages.messages"; //$NON-NLS-1$
+
+  private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
+
+  private Messages()
+  {
+  }
+
+  public static String getString(String key)
+  {
+    try
+    {
+      return RESOURCE_BUNDLE.getString(key);
+    }
+    catch (MissingResourceException e)
+    {
+      return '!' + key + '!';
+    }
+  }
+}
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/messages/messages.properties b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/messages/messages.properties
new file mode 100644
index 0000000000..3b1216469a
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/messages/messages.properties
@@ -0,0 +1,58 @@
+# ==============================================================================
+# Copyright (c) 2004 - 2009 Eike Stepper (Berlin, Germany) and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#    Victor Roldan Betancort - initial API and implementation
+#    Eike Stepper            - maintenance
+# ==============================================================================
+
+# ==============================================================================
+# This properties file contains all strings subject to be shown in the UI.
+# ==============================================================================
+
+ContainerView_1=Refresh
+ContainerView_2=Refresh view
+CredentialsDialog_1=Enter your user ID and password.
+CredentialsDialog_2=User ID:
+CredentialsDialog_3=Password:
+CredentialsDialog_0=Login
+IntrospectAction_0=Introspect
+MasterDetailsView_2=Refresh
+MasterDetailsView_3=Refresh
+Net4jContainerItemProvider_0=Remove
+Net4jContainerItemProvider.1=Remove
+Net4jIntrospectorView_1=
+Net4jIntrospectorView_10=Type
+Net4jIntrospectorView_11=Element
+Net4jIntrospectorView_12=Type
+Net4jIntrospectorView_13=Index
+Net4jIntrospectorView_14=Element
+Net4jIntrospectorView_15=Type
+Net4jIntrospectorView_16=Back
+Net4jIntrospectorView_17=Container
+Net4jIntrospectorView_18=null
+Net4jIntrospectorView_21=null
+Net4jIntrospectorView_22=
+Net4jIntrospectorView_24=null
+Net4jIntrospectorView_25=
+Net4jIntrospectorView_27=null
+Net4jIntrospectorView_28=null
+Net4jIntrospectorView_29=
+Net4jIntrospectorView_4=Field
+Net4jIntrospectorView_5=Value
+Net4jIntrospectorView_6=Declared Type
+Net4jIntrospectorView_7=Concrete Type
+Net4jIntrospectorView_8=Key
+Net4jIntrospectorView_9=Value
+SafeAction_0=...
+SafeAction_1=See the Error log for details.
+SafeActionDelegate_0=See the Error log for details.
+SafeActionDelegate_1=Error
+SashLayoutAction_0=Vertical
+SashLayoutAction_1=Horizontal
+SashLayoutAction_2=Layout
+TextAndDisable.0=Disabled
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jContainerItemProvider.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jContainerItemProvider.java
index b67db24f99..eb4aa0b2b9 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jContainerItemProvider.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jContainerItemProvider.java
@@ -12,6 +12,7 @@ package org.eclipse.net4j.util.internal.ui.views;
 
 import org.eclipse.net4j.util.container.IContainer;
 import org.eclipse.net4j.util.internal.ui.SharedIcons;
+import org.eclipse.net4j.util.internal.ui.messages.Messages;
 import org.eclipse.net4j.util.lifecycle.LifecycleUtil;
 import org.eclipse.net4j.util.ui.actions.LongRunningAction;
 import org.eclipse.net4j.util.ui.views.ContainerItemProvider;
@@ -60,7 +61,7 @@ public class Net4jContainerItemProvider extends ContainerItemProvider<IContainer
 
     public RemoveAction(ITreeSelection selection)
     {
-      super("Remove", "Remove", ContainerView.getDeleteImageDescriptor());
+      super(Messages.getString("Net4jContainerItemProvider_0"), Messages.getString("Net4jContainerItemProvider.1"), ContainerView.getDeleteImageDescriptor()); //$NON-NLS-1$ //$NON-NLS-2$
       this.selection = selection;
     }
 
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jIntrospectorView.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jIntrospectorView.java
index cdc723fd3e..8132a40587 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jIntrospectorView.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jIntrospectorView.java
@@ -19,6 +19,7 @@ import org.eclipse.net4j.util.event.IEvent;
 import org.eclipse.net4j.util.event.IListener;
 import org.eclipse.net4j.util.internal.ui.SharedIcons;
 import org.eclipse.net4j.util.internal.ui.bundle.OM;
+import org.eclipse.net4j.util.internal.ui.messages.Messages;
 import org.eclipse.net4j.util.ui.UIUtil;
 
 import org.eclipse.jface.action.Action;
@@ -62,7 +63,7 @@ import java.util.Stack;
  */
 public class Net4jIntrospectorView extends ViewPart implements ISelectionListener, IDoubleClickListener, IListener
 {
-  public static final String VIEW_ID = "org.eclipse.net4j.util.Net4jIntrospectorView";
+  public static final String VIEW_ID = "org.eclipse.net4j.util.Net4jIntrospectorView"; //$NON-NLS-1$
 
   private static final Object[] NO_ELEMENTS = {};
 
@@ -307,8 +308,8 @@ public class Net4jIntrospectorView extends ViewPart implements ISelectionListene
 
     if (object == null)
     {
-      classLabel.setText("");
-      objectLabel.setText("");
+      classLabel.setText(""); //$NON-NLS-1$
+      objectLabel.setText(""); //$NON-NLS-1$
       currentViewer = objectViewer;
     }
     else
@@ -318,7 +319,7 @@ public class Net4jIntrospectorView extends ViewPart implements ISelectionListene
       classLabel.setText(className);
 
       String value = object.toString();
-      if (value.startsWith(className + "@"))
+      if (value.startsWith(className + "@")) //$NON-NLS-1$
       {
         objectLabel.setText(value.substring(className.length()));
       }
@@ -354,7 +355,7 @@ public class Net4jIntrospectorView extends ViewPart implements ISelectionListene
   private void createObjectColmuns()
   {
     Table table = objectViewer.getTable();
-    String[] columnNames = { "Field", "Value", "Declared Type", "Concrete Type" };
+    String[] columnNames = { Messages.getString("Net4jIntrospectorView_4"), Messages.getString("Net4jIntrospectorView_5"), Messages.getString("Net4jIntrospectorView_6"), Messages.getString("Net4jIntrospectorView_7") }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
     int[] columnWidths = { 200, 400, 300, 300 };
     createColumns(table, columnNames, columnWidths);
   }
@@ -362,7 +363,7 @@ public class Net4jIntrospectorView extends ViewPart implements ISelectionListene
   private void createMapColmuns()
   {
     Table table = mapViewer.getTable();
-    String[] columnNames = { "Key", "Value", "Type" };
+    String[] columnNames = { Messages.getString("Net4jIntrospectorView_8"), Messages.getString("Net4jIntrospectorView_9"), Messages.getString("Net4jIntrospectorView_10") }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     int[] columnWidths = { 200, 400, 300 };
     createColumns(table, columnNames, columnWidths);
   }
@@ -370,7 +371,7 @@ public class Net4jIntrospectorView extends ViewPart implements ISelectionListene
   private void createIterableColmuns()
   {
     Table table = iterableViewer.getTable();
-    String[] columnNames = { "Element", "Type" };
+    String[] columnNames = { Messages.getString("Net4jIntrospectorView_11"), Messages.getString("Net4jIntrospectorView_12") }; //$NON-NLS-1$ //$NON-NLS-2$
     int[] columnWidths = { 400, 300 };
     createColumns(table, columnNames, columnWidths);
   }
@@ -378,7 +379,7 @@ public class Net4jIntrospectorView extends ViewPart implements ISelectionListene
   private void createArrayColmuns()
   {
     Table table = arrayViewer.getTable();
-    String[] columnNames = { "Index", "Element", "Type" };
+    String[] columnNames = { Messages.getString("Net4jIntrospectorView_13"), Messages.getString("Net4jIntrospectorView_14"), Messages.getString("Net4jIntrospectorView_15") }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     int[] columnWidths = { 50, 400, 300 };
     createColumns(table, columnNames, columnWidths);
   }
@@ -413,7 +414,7 @@ public class Net4jIntrospectorView extends ViewPart implements ISelectionListene
   {
     private BackAction()
     {
-      super("Back");
+      super(Messages.getString("Net4jIntrospectorView_16")); //$NON-NLS-1$
       ISharedImages sharedImages = PlatformUI.getWorkbench().getSharedImages();
       setImageDescriptor(sharedImages.getImageDescriptor(ISharedImages.IMG_TOOL_BACK));
       setDisabledImageDescriptor(sharedImages.getImageDescriptor(ISharedImages.IMG_TOOL_BACK_DISABLED));
@@ -440,7 +441,7 @@ public class Net4jIntrospectorView extends ViewPart implements ISelectionListene
   {
     private ContainerAction()
     {
-      super("Container");
+      super(Messages.getString("Net4jIntrospectorView_17")); //$NON-NLS-1$
       setImageDescriptor(SharedIcons.getDescriptor(SharedIcons.VIEW_CONTAINER));
     }
 
@@ -531,11 +532,11 @@ public class Net4jIntrospectorView extends ViewPart implements ISelectionListene
           case 0:
             return field.getName();
           case 1:
-            return value == null ? "null" : value.toString();
+            return value == null ? Messages.getString("Net4jIntrospectorView_18") : value.toString(); //$NON-NLS-1$
           case 2:
             return field.getType().getName();
           case 3:
-            return value == null ? "" : value.getClass().getName();
+            return value == null ? Messages.getString("Net4jIntrospectorView_1") : value.getClass().getName(); //$NON-NLS-1$
           }
         }
         catch (RuntimeException ex)
@@ -544,7 +545,7 @@ public class Net4jIntrospectorView extends ViewPart implements ISelectionListene
         }
       }
 
-      return "";
+      return ""; //$NON-NLS-1$
     }
   }
 
@@ -584,12 +585,12 @@ public class Net4jIntrospectorView extends ViewPart implements ISelectionListene
       switch (index)
       {
       case 0:
-        return obj == null ? "null" : obj.toString();
+        return obj == null ? Messages.getString("Net4jIntrospectorView_21") : obj.toString(); //$NON-NLS-1$
       case 1:
-        return obj == null ? "" : obj.getClass().getName();
+        return obj == null ? Messages.getString("Net4jIntrospectorView_22") : obj.getClass().getName(); //$NON-NLS-1$
       }
 
-      return "";
+      return ""; //$NON-NLS-1$
     }
   }
 
@@ -641,9 +642,9 @@ public class Net4jIntrospectorView extends ViewPart implements ISelectionListene
           case 0:
             return String.valueOf(i);
           case 1:
-            return value == null ? "null" : value.toString();
+            return value == null ? Messages.getString("Net4jIntrospectorView_24") : value.toString(); //$NON-NLS-1$
           case 2:
-            return value == null ? "" : value.getClass().getName();
+            return value == null ? Messages.getString("Net4jIntrospectorView_25") : value.getClass().getName(); //$NON-NLS-1$
           }
         }
         catch (RuntimeException ex)
@@ -652,7 +653,7 @@ public class Net4jIntrospectorView extends ViewPart implements ISelectionListene
         }
       }
 
-      return "";
+      return ""; //$NON-NLS-1$
     }
   }
 
@@ -691,15 +692,15 @@ public class Net4jIntrospectorView extends ViewPart implements ISelectionListene
         switch (index)
         {
         case 0:
-          return key == null ? "null" : key.toString();
+          return key == null ? Messages.getString("Net4jIntrospectorView_27") : key.toString(); //$NON-NLS-1$
         case 1:
-          return value == null ? "null" : value.toString();
+          return value == null ? Messages.getString("Net4jIntrospectorView_28") : value.toString(); //$NON-NLS-1$
         case 2:
-          return value == null ? "" : value.getClass().getName();
+          return value == null ? Messages.getString("Net4jIntrospectorView_29") : value.getClass().getName(); //$NON-NLS-1$
         }
       }
 
-      return "";
+      return ""; //$NON-NLS-1$
     }
   }
 
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/DelegatingContentProvider.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/DelegatingContentProvider.java
index 1d6a6ffbd2..a934d16c8e 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/DelegatingContentProvider.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/DelegatingContentProvider.java
@@ -18,7 +18,7 @@ import org.eclipse.jface.viewers.Viewer;
  */
 public class DelegatingContentProvider implements IStructuredContentProvider
 {
-  public static final String NONE = "";
+  public static final String NONE = ""; //$NON-NLS-1$
 
   private IStructuredContentProvider delegate;
 
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/StaticContentProvider.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/StaticContentProvider.java
index ec1fb8f74f..c79dbcf9fe 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/StaticContentProvider.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/StaticContentProvider.java
@@ -44,7 +44,7 @@ public class StaticContentProvider extends StructuredContentProvider<Object>
     Object[] enumConstants = enumClass.getEnumConstants();
     if (enumConstants == null)
     {
-      throw new IllegalArgumentException("Illegal enum: " + enumClass);
+      throw new IllegalArgumentException("Illegal enum: " + enumClass); //$NON-NLS-1$
     }
 
     return enumConstants;
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/UIActivator.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/UIActivator.java
index 80b30afed2..ba5226ce39 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/UIActivator.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/UIActivator.java
@@ -46,7 +46,7 @@ public class UIActivator extends AbstractUIPlugin
     OSGiActivator.traceStart(context);
     if (omBundle == null)
     {
-      throw new IllegalStateException("bundle == null");
+      throw new IllegalStateException("bundle == null"); //$NON-NLS-1$
     }
 
     try
@@ -73,7 +73,7 @@ public class UIActivator extends AbstractUIPlugin
     OSGiActivator.traceStop(context);
     if (omBundle == null)
     {
-      throw new IllegalStateException("bundle == null");
+      throw new IllegalStateException("bundle == null"); //$NON-NLS-1$
     }
 
     try
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/UIUtil.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/UIUtil.java
index 1210d83b01..3a97f64a3d 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/UIUtil.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/UIUtil.java
@@ -107,7 +107,7 @@ public final class UIUtil
 
     if (display == null)
     {
-      throw new IllegalStateException("No display available");
+      throw new IllegalStateException("No display available"); //$NON-NLS-1$
     }
 
     return display;
@@ -121,7 +121,7 @@ public final class UIUtil
     IWorkbench workbench = PlatformUI.getWorkbench();
     if (workbench == null)
     {
-      throw new IllegalStateException("No workbench available");
+      throw new IllegalStateException("No workbench available"); //$NON-NLS-1$
     }
 
     return workbench;
@@ -135,7 +135,7 @@ public final class UIUtil
     IWorkbenchWindow window = getWorkbench().getActiveWorkbenchWindow();
     if (window == null)
     {
-      throw new IllegalStateException("No active window available");
+      throw new IllegalStateException("No active window available"); //$NON-NLS-1$
     }
 
     return window;
@@ -149,7 +149,7 @@ public final class UIUtil
     IWorkbenchPage page = getActiveWorkbenchWindow().getActivePage();
     if (page == null)
     {
-      throw new IllegalStateException("No active page available");
+      throw new IllegalStateException("No active page available"); //$NON-NLS-1$
     }
 
     return page;
@@ -163,7 +163,7 @@ public final class UIUtil
     IWorkbenchPart part = getActiveWorkbenchPage().getActivePart();
     if (part == null)
     {
-      throw new IllegalStateException("No active part available");
+      throw new IllegalStateException("No active part available"); //$NON-NLS-1$
     }
 
     return part;
@@ -268,7 +268,7 @@ public final class UIUtil
   {
     if (control == null)
     {
-      throw new IllegalArgumentException("control == null");
+      throw new IllegalArgumentException("control == null"); //$NON-NLS-1$
     }
 
     Object data = control.getLayoutData();
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/actions/SafeAction.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/actions/SafeAction.java
index 869673b5a9..4f1089ca4c 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/actions/SafeAction.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/actions/SafeAction.java
@@ -11,6 +11,7 @@
 package org.eclipse.net4j.util.ui.actions;
 
 import org.eclipse.net4j.util.internal.ui.bundle.OM;
+import org.eclipse.net4j.util.internal.ui.messages.Messages;
 
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.dialogs.MessageDialog;
@@ -21,7 +22,7 @@ import org.eclipse.jface.resource.ImageDescriptor;
  */
 public abstract class SafeAction extends Action
 {
-  public static final String INTERACTIVE = "...";
+  public static final String INTERACTIVE = Messages.getString("SafeAction_0"); //$NON-NLS-1$
 
   public SafeAction()
   {
@@ -64,7 +65,7 @@ public abstract class SafeAction extends Action
     catch (Exception ex)
     {
       OM.LOG.error(ex);
-      MessageDialog.openError(null, getText(), ex.getMessage() + "\nSee the Error log for details.");
+      MessageDialog.openError(null, getText(), ex.getLocalizedMessage() + "\n" + Messages.getString("SafeAction_1")); //$NON-NLS-1$ //$NON-NLS-2$
     }
   }
 
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/actions/SafeActionDelegate.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/actions/SafeActionDelegate.java
index 3adce769e5..26081f899c 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/actions/SafeActionDelegate.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/actions/SafeActionDelegate.java
@@ -11,6 +11,7 @@
 package org.eclipse.net4j.util.ui.actions;
 
 import org.eclipse.net4j.util.internal.ui.bundle.OM;
+import org.eclipse.net4j.util.internal.ui.messages.Messages;
 
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.dialogs.MessageDialog;
@@ -57,7 +58,8 @@ public abstract class SafeActionDelegate implements IActionDelegate
     catch (Exception ex)
     {
       OM.LOG.error(ex);
-      MessageDialog.openError(null, getText(), ex.getMessage() + "\nSee the Error log for details.");
+      MessageDialog.openError(null, getText(), ex.getLocalizedMessage()
+          + "\n" + Messages.getString("SafeActionDelegate_0")); //$NON-NLS-1$ //$NON-NLS-2$
     }
   }
 
@@ -65,6 +67,6 @@ public abstract class SafeActionDelegate implements IActionDelegate
 
   protected String getText()
   {
-    return action == null ? "Error" : action.getText();
+    return action == null ? Messages.getString("SafeActionDelegate_1") : action.getText(); //$NON-NLS-1$
   }
 }
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/actions/SashLayoutAction.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/actions/SashLayoutAction.java
index c9a5117a25..e9b087ab2c 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/actions/SashLayoutAction.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/actions/SashLayoutAction.java
@@ -12,6 +12,7 @@ package org.eclipse.net4j.util.ui.actions;
 
 import org.eclipse.net4j.util.event.IEvent;
 import org.eclipse.net4j.util.event.IListener;
+import org.eclipse.net4j.util.internal.ui.messages.Messages;
 import org.eclipse.net4j.util.ui.widgets.SashComposite;
 
 import org.eclipse.jface.action.IAction;
@@ -52,7 +53,7 @@ public abstract class SashLayoutAction extends SafeAction implements IListener
   {
     public Vertical(SashComposite sashComposite)
     {
-      super(sashComposite, "Vertical");
+      super(sashComposite, Messages.getString("SashLayoutAction_0")); //$NON-NLS-1$
     }
 
     @Override
@@ -77,7 +78,7 @@ public abstract class SashLayoutAction extends SafeAction implements IListener
   {
     public Horizontal(SashComposite sashComposite)
     {
-      super(sashComposite, "Horizontal");
+      super(sashComposite, Messages.getString("SashLayoutAction_1")); //$NON-NLS-1$
     }
 
     @Override
@@ -106,7 +107,7 @@ public abstract class SashLayoutAction extends SafeAction implements IListener
 
     public LayoutMenu(SashComposite sashComposite)
     {
-      super("Layout");
+      super(Messages.getString("SashLayoutAction_2")); //$NON-NLS-1$
       add(verticalAction = new SashLayoutAction.Vertical(sashComposite));
       add(horizontalAction = new SashLayoutAction.Horizontal(sashComposite));
     }
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/prefs/OMPreferenceStore.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/prefs/OMPreferenceStore.java
index 5f43cb30f5..fffd2d0b28 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/prefs/OMPreferenceStore.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/prefs/OMPreferenceStore.java
@@ -266,7 +266,7 @@ public class OMPreferenceStore implements IPreferenceStore
     OMPreference<?> pref = preferences.get(name);
     if (pref == null)
     {
-      throw new IllegalStateException("No preference for " + name);
+      throw new IllegalStateException("No preference for " + name); //$NON-NLS-1$
     }
 
     return pref;
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/security/CredentialsDialog.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/security/CredentialsDialog.java
index 029fb403af..e59d779056 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/security/CredentialsDialog.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/security/CredentialsDialog.java
@@ -11,6 +11,7 @@
 package org.eclipse.net4j.util.ui.security;
 
 import org.eclipse.net4j.util.internal.ui.bundle.OM;
+import org.eclipse.net4j.util.internal.ui.messages.Messages;
 import org.eclipse.net4j.util.security.IPasswordCredentials;
 import org.eclipse.net4j.util.security.PasswordCredentials;
 import org.eclipse.net4j.util.ui.UIUtil;
@@ -30,9 +31,9 @@ import org.eclipse.swt.widgets.Text;
  */
 public class CredentialsDialog extends BaseDialog<Viewer>
 {
-  private static final String TITLE = "Login";
+  private static final String TITLE = Messages.getString("CredentialsDialog_0"); //$NON-NLS-1$
 
-  private static final String MESSAGE = "Enter your user ID and password.";
+  private static final String MESSAGE = Messages.getString("CredentialsDialog_1"); //$NON-NLS-1$
 
   private Text userIDControl;
 
@@ -57,10 +58,10 @@ public class CredentialsDialog extends BaseDialog<Viewer>
     composite.setLayout(new GridLayout(2, false));
     composite.setLayoutData(UIUtil.createGridData());
 
-    new Label(composite, SWT.NONE).setText("User ID:");
+    new Label(composite, SWT.NONE).setText(Messages.getString("CredentialsDialog_2")); //$NON-NLS-1$
     userIDControl = new Text(composite, SWT.BORDER);
 
-    new Label(composite, SWT.NONE).setText("Password:");
+    new Label(composite, SWT.NONE).setText(Messages.getString("CredentialsDialog_3")); //$NON-NLS-1$
     passwordControl = new Text(composite, SWT.BORDER | SWT.PASSWORD);
   }
 
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerItemProvider.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerItemProvider.java
index 0b8dd48ecb..11b65b5e6d 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerItemProvider.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerItemProvider.java
@@ -181,7 +181,7 @@ public class ContainerItemProvider<CONTAINER extends IContainer<Object>> extends
 
     if (node == null)
     {
-      throw new IllegalStateException("No node for " + element);
+      throw new IllegalStateException("No node for " + element); //$NON-NLS-1$
     }
 
     return node;
@@ -278,7 +278,7 @@ public class ContainerItemProvider<CONTAINER extends IContainer<Object>> extends
     @Override
     public String toString()
     {
-      return MessageFormat.format("{0}[{1}]", getClass().getSimpleName(), getElement());
+      return MessageFormat.format("{0}[{1}]", getClass().getSimpleName(), getElement()); //$NON-NLS-1$
     }
 
     public final Node getParent()
@@ -297,7 +297,7 @@ public class ContainerItemProvider<CONTAINER extends IContainer<Object>> extends
     {
       if (disposed)
       {
-        throw new IllegalStateException("Node is already disposed of");
+        throw new IllegalStateException("Node is already disposed of"); //$NON-NLS-1$
       }
     }
 
@@ -448,7 +448,7 @@ public class ContainerItemProvider<CONTAINER extends IContainer<Object>> extends
       this.container = container;
       if (container == null)
       {
-        throw new IllegalArgumentException("container == null");
+        throw new IllegalArgumentException("container == null"); //$NON-NLS-1$
       }
     }
 
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerView.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerView.java
index 05cb3dc50c..d44b9e7d8a 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerView.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerView.java
@@ -13,6 +13,7 @@ package org.eclipse.net4j.util.ui.views;
 import org.eclipse.net4j.util.container.IContainer;
 import org.eclipse.net4j.util.internal.ui.SharedIcons;
 import org.eclipse.net4j.util.internal.ui.actions.IntrospectAction;
+import org.eclipse.net4j.util.internal.ui.messages.Messages;
 import org.eclipse.net4j.util.ui.UIUtil;
 import org.eclipse.net4j.util.ui.actions.SafeAction;
 
@@ -211,7 +212,7 @@ public abstract class ContainerView extends ViewPart implements ISetSelectionTar
 
   protected void hookContextMenu()
   {
-    MenuManager menuMgr = new MenuManager("#PopupMenu");
+    MenuManager menuMgr = new MenuManager("#PopupMenu"); //$NON-NLS-1$
     menuMgr.setRemoveAllWhenShown(true);
     menuMgr.addMenuListener(new IMenuListener()
     {
@@ -446,7 +447,7 @@ public abstract class ContainerView extends ViewPart implements ISetSelectionTar
   {
     private RefreshAction()
     {
-      super("Refresh", "Refresh view", getRefreshImageDescriptor());
+      super(Messages.getString("ContainerView_1"), Messages.getString("ContainerView_2"), getRefreshImageDescriptor()); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     @Override
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/MasterDetailsView.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/MasterDetailsView.java
index 3947e586cf..820813c76f 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/MasterDetailsView.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/MasterDetailsView.java
@@ -12,6 +12,7 @@ package org.eclipse.net4j.util.ui.views;
 
 import org.eclipse.net4j.util.ObjectUtil;
 import org.eclipse.net4j.util.internal.ui.bundle.OM;
+import org.eclipse.net4j.util.internal.ui.messages.Messages;
 import org.eclipse.net4j.util.ui.UIUtil;
 import org.eclipse.net4j.util.ui.actions.SafeAction;
 import org.eclipse.net4j.util.ui.actions.SashLayoutAction;
@@ -176,9 +177,9 @@ public abstract class MasterDetailsView extends MultiViewersView
   protected void fillLocalPullDown(IMenuManager manager)
   {
     super.fillLocalPullDown(manager);
-    manager.add(new Separator("group1"));
+    manager.add(new Separator("group1")); //$NON-NLS-1$
     manager.add(new SashLayoutAction.LayoutMenu(sash));
-    manager.add(new Separator("group2"));
+    manager.add(new Separator("group2")); //$NON-NLS-1$
     manager.add(new RefreshAction());
   }
 
@@ -300,7 +301,7 @@ public abstract class MasterDetailsView extends MultiViewersView
   {
     public RefreshAction()
     {
-      super("Refresh", "Refresh", OM.getImageDescriptor("icons/full/etool16/refresh.gif"));
+      super(Messages.getString("MasterDetailsView_2"), Messages.getString("MasterDetailsView_3"), OM.getImageDescriptor("icons/full/etool16/refresh.gif")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
     @Override
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/MultiViewersView.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/MultiViewersView.java
index 385486d890..72b3e284a6 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/MultiViewersView.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/MultiViewersView.java
@@ -315,7 +315,7 @@ public abstract class MultiViewersView extends ViewPart implements ISetSelection
 
   private void hookContextMenu(final StructuredViewer viewer)
   {
-    MenuManager menuMgr = new MenuManager("#PopupMenu");
+    MenuManager menuMgr = new MenuManager("#PopupMenu"); //$NON-NLS-1$
     menuMgr.setRemoveAllWhenShown(true);
     menuMgr.addMenuListener(new IMenuListener()
     {
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/BaseDialog.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/BaseDialog.java
index 7c1339797e..9710ce749c 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/BaseDialog.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/BaseDialog.java
@@ -67,7 +67,7 @@ public abstract class BaseDialog<VIEWER extends Viewer> extends TitleAreaDialog
     setTitle(title);
     setMessage(message);
 
-    contextMenu = new MenuManager("#PopupMenu");
+    contextMenu = new MenuManager("#PopupMenu"); //$NON-NLS-1$
     contextMenu.setRemoveAllWhenShown(true);
     contextMenu.addMenuListener(new IMenuListener()
     {
@@ -111,7 +111,7 @@ public abstract class BaseDialog<VIEWER extends Viewer> extends TitleAreaDialog
 
   protected void hookContextMenu()
   {
-    contextMenu = new MenuManager("#PopupMenu");
+    contextMenu = new MenuManager("#PopupMenu"); //$NON-NLS-1$
     contextMenu.setRemoveAllWhenShown(true);
     contextMenu.addMenuListener(new IMenuListener()
     {
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/HistoryText.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/HistoryText.java
index d2c74b0620..21d9709ec5 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/HistoryText.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/HistoryText.java
@@ -84,7 +84,7 @@ public class HistoryText
 
     try
     {
-      droppedMethod = combo.getClass().getDeclaredMethod("isDropped", ReflectUtil.NO_PARAMETERS);
+      droppedMethod = combo.getClass().getDeclaredMethod("isDropped", ReflectUtil.NO_PARAMETERS); //$NON-NLS-1$
       droppedMethod.setAccessible(true);
     }
     catch (Exception ex)
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/HistoryTextDialog.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/HistoryTextDialog.java
index 62532c0446..be97f1d7dd 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/HistoryTextDialog.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/HistoryTextDialog.java
@@ -33,7 +33,7 @@ import org.eclipse.swt.widgets.Text;
  */
 public class HistoryTextDialog extends InputDialog
 {
-  private static final String EMPTY = "";
+  private static final String EMPTY = ""; //$NON-NLS-1$
 
   private IHistory<String> history;
 
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/LogDialog.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/LogDialog.java
index 794189b23f..786e2c9cac 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/LogDialog.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/LogDialog.java
@@ -69,7 +69,7 @@ public class LogDialog extends BaseDialog<Viewer>
   {
     if (textStyle == null)
     {
-      throw new IllegalArgumentException("textStyle == null");
+      throw new IllegalArgumentException("textStyle == null"); //$NON-NLS-1$
     }
 
     if (textStyle.equals(this.textStyle))
@@ -104,7 +104,7 @@ public class LogDialog extends BaseDialog<Viewer>
     {
       checkStyleRange();
       ByteArrayOutputStream bytes = new ByteArrayOutputStream();
-      String message = t.getMessage() + "\n";
+      String message = t.getMessage() + "\n"; //$NON-NLS-1$
       bytes.write(message.getBytes());
       t.printStackTrace(new PrintStream(bytes));
 
@@ -138,7 +138,7 @@ public class LogDialog extends BaseDialog<Viewer>
     composite.setLayout(grid);
     composite.setLayoutData(UIUtil.createGridData());
 
-    font = new Font(getShell().getDisplay(), "Courier New", 9, SWT.NORMAL);
+    font = new Font(getShell().getDisplay(), "Courier New", 9, SWT.NORMAL); //$NON-NLS-1$
     checkStyleRange();
     lastStyleRange = currentStyleRange;
     checkStyleRange();
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/OneBorderComposite.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/OneBorderComposite.java
index 0efeee7f83..35fe2dea54 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/OneBorderComposite.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/OneBorderComposite.java
@@ -71,7 +71,7 @@ public abstract class OneBorderComposite extends Composite
     borderPosition = borderPosition & POSITION_MASK;
     if (Integer.bitCount(borderPosition) != 1)
     {
-      throw new IllegalArgumentException("borderPosition: " + borderPosition);
+      throw new IllegalArgumentException("borderPosition: " + borderPosition); //$NON-NLS-1$
     }
 
     if (this.borderPosition != borderPosition)
@@ -131,16 +131,16 @@ public abstract class OneBorderComposite extends Composite
     switch (borderPosition)
     {
     case SWT.LEFT:
-      return "LEFT";
+      return "LEFT"; //$NON-NLS-1$
 
     case SWT.RIGHT:
-      return "RIGHT";
+      return "RIGHT"; //$NON-NLS-1$
 
     case SWT.TOP:
-      return "TOP";
+      return "TOP"; //$NON-NLS-1$
 
     case SWT.BOTTOM:
-      return "BOTTOM";
+      return "BOTTOM"; //$NON-NLS-1$
     }
 
     return super.toString();
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/TextAndDisable.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/TextAndDisable.java
index 8b78afaa20..634bafa3d3 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/TextAndDisable.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/TextAndDisable.java
@@ -11,6 +11,7 @@
 package org.eclipse.net4j.util.ui.widgets;
 
 import org.eclipse.net4j.util.ObjectUtil;
+import org.eclipse.net4j.util.internal.ui.messages.Messages;
 import org.eclipse.net4j.util.ui.UIUtil;
 
 import org.eclipse.swt.SWT;
@@ -47,7 +48,7 @@ public class TextAndDisable extends Composite implements SelectionListener, Modi
     text.addModifyListener(this);
 
     disabled = createButton();
-    disabled.setText("Disabled");
+    disabled.setText(Messages.getString("TextAndDisable.0")); //$NON-NLS-1$
     disabled.addSelectionListener(this);
     disabled.setLayoutData(UIUtil.createGridData(false, false));
   }
diff --git a/plugins/org.eclipse.net4j.util/plugin.properties b/plugins/org.eclipse.net4j.util/plugin.properties
index a007a3c30b..943d76b402 100644
--- a/plugins/org.eclipse.net4j.util/plugin.properties
+++ b/plugins/org.eclipse.net4j.util/plugin.properties
@@ -23,3 +23,6 @@ providerName = Eclipse Modeling Project
 # %%% END OF TRANSLATED PROPERTIES %%%
 # The above properties have been shipped for translation.
 # ==============================================================================
+
+extension-point.name = Factories
+extension-point.name.0 = Element Processors
+\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.util/plugin.xml b/plugins/org.eclipse.net4j.util/plugin.xml
index 2c15e93d7a..bba1b46f4e 100644
--- a/plugins/org.eclipse.net4j.util/plugin.xml
+++ b/plugins/org.eclipse.net4j.util/plugin.xml
@@ -13,8 +13,8 @@
 
 <plugin>
 
-   <extension-point id="factories" name="Factories" schema="schema/factories.exsd"/>
-   <extension-point id="elementProcessors" name="Element Processors" schema="schema/elementProcessors.exsd"/>
+   <extension-point id="factories" name="%extension-point.name" schema="schema/factories.exsd"/>
+   <extension-point id="elementProcessors" name="%extension-point.name.0" schema="schema/elementProcessors.exsd"/>
    
    <extension
          point="org.eclipse.net4j.util.factories">
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/AbstractBundle.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/AbstractBundle.java
index 597690a678..f8e04b2e26 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/AbstractBundle.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/AbstractBundle.java
@@ -220,12 +220,12 @@ public abstract class AbstractBundle implements OMBundle, OMBundle.DebugSupport,
   public InputStream getInputStream(String path) throws IOException
   {
     String base = getBaseURL().toString();
-    if (!base.endsWith("/"))
+    if (!base.endsWith("/")) //$NON-NLS-1$
     {
-      base += "/";
+      base += "/"; //$NON-NLS-1$
     }
 
-    if (path.startsWith("/"))
+    if (path.startsWith("/")) //$NON-NLS-1$
     {
       path = path.substring(1);
     }
@@ -340,7 +340,7 @@ public abstract class AbstractBundle implements OMBundle, OMBundle.DebugSupport,
 
   public void start() throws Exception
   {
-    invokeMethod("start");
+    invokeMethod("start"); //$NON-NLS-1$
   }
 
   public void stop() throws Exception
@@ -357,7 +357,7 @@ public abstract class AbstractBundle implements OMBundle, OMBundle.DebugSupport,
       OM.LOG.error(ex);
     }
 
-    invokeMethod("stop");
+    invokeMethod("stop"); //$NON-NLS-1$
   }
 
   protected OMTracer createTracer(String name)
@@ -372,7 +372,7 @@ public abstract class AbstractBundle implements OMBundle, OMBundle.DebugSupport,
 
   protected String getConfigFileName()
   {
-    return bundleID + ".properties";
+    return bundleID + ".properties"; //$NON-NLS-1$
   }
 
   private void invokeMethod(String name) throws Exception
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/AbstractPlatform.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/AbstractPlatform.java
index 26ecaec0bd..6695043acd 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/AbstractPlatform.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/AbstractPlatform.java
@@ -126,11 +126,11 @@ public abstract class AbstractPlatform implements OMPlatform
       state = System.getProperty(SYSTEM_PROPERTY_OSGI_STATE);
       if (state == null)
       {
-        state = "state";
+        state = "state"; //$NON-NLS-1$
       }
       else
       {
-        state += ".metadata";
+        state += ".metadata"; //$NON-NLS-1$
       }
     }
 
@@ -139,14 +139,14 @@ public abstract class AbstractPlatform implements OMPlatform
     {
       if (!stateFolder.mkdirs())
       {
-        OM.LOG.error("State folder " + stateFolder.getAbsolutePath() + " could not be created");
+        OM.LOG.error("State folder " + stateFolder.getAbsolutePath() + " could not be created"); //$NON-NLS-1$ //$NON-NLS-2$
         return null;
       }
     }
 
     if (!stateFolder.isDirectory())
     {
-      OM.LOG.error("State folder " + stateFolder.getAbsolutePath() + " is not a directoy");
+      OM.LOG.error("State folder " + stateFolder.getAbsolutePath() + " is not a directoy"); //$NON-NLS-1$ //$NON-NLS-2$
       return null;
     }
 
@@ -155,20 +155,20 @@ public abstract class AbstractPlatform implements OMPlatform
 
   public File getConfigFolder()
   {
-    String config = System.getProperty(SYSTEM_PROPERTY_NET4J_CONFIG, "config");
+    String config = System.getProperty(SYSTEM_PROPERTY_NET4J_CONFIG, "config"); //$NON-NLS-1$
     File configFolder = new File(config);
     if (!configFolder.exists())
     {
       if (!configFolder.mkdirs())
       {
-        OM.LOG.error("Config folder " + configFolder.getAbsolutePath() + " could not be created");
+        OM.LOG.error("Config folder " + configFolder.getAbsolutePath() + " could not be created"); //$NON-NLS-1$ //$NON-NLS-2$
         return null;
       }
     }
 
     if (!configFolder.isDirectory())
     {
-      OM.LOG.error("Config folder " + configFolder.getAbsolutePath() + " is not a directoy");
+      OM.LOG.error("Config folder " + configFolder.getAbsolutePath() + " is not a directoy"); //$NON-NLS-1$ //$NON-NLS-2$
       return null;
     }
 
@@ -204,7 +204,7 @@ public abstract class AbstractPlatform implements OMPlatform
     }
     catch (IOException ex)
     {
-      OM.LOG.error("Config file " + configFile.getAbsolutePath() + " could not be read");
+      OM.LOG.error("Config file " + configFile.getAbsolutePath() + " could not be read"); //$NON-NLS-1$ //$NON-NLS-2$
       return null;
     }
     finally
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/OM.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/OM.java
index 792f854081..9780a9a46c 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/OM.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/OM.java
@@ -67,7 +67,7 @@ public abstract class OM
       ((OSGiBundle)OM.BUNDLE).start();
 
       // TODO Make configurable
-      PrintTraceHandler.CONSOLE.setPattern("{6} [{0}] {5}");
+      PrintTraceHandler.CONSOLE.setPattern("{6} [{0}] {5}"); //$NON-NLS-1$
       AbstractPlatform.INSTANCE.addTraceHandler(PrintTraceHandler.CONSOLE);
       AbstractPlatform.INSTANCE.addLogHandler(PrintLogHandler.CONSOLE);
 
@@ -83,7 +83,7 @@ public abstract class OM
       IPluginContainer container = IPluginContainer.INSTANCE;
       if (TRACER.isEnabled())
       {
-        TRACER.format("Plugin container created: {0}", container);
+        TRACER.format("Plugin container created: {0}", container); //$NON-NLS-1$
       }
     }
 
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/PluginElementProcessorList.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/PluginElementProcessorList.java
index 6c607037f9..efca00e481 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/PluginElementProcessorList.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/PluginElementProcessorList.java
@@ -32,11 +32,11 @@ import java.util.ListIterator;
  */
 public class PluginElementProcessorList extends Lifecycle implements List<IElementProcessor>
 {
-  private static final String ATTR_CLASS = "class";
+  private static final String ATTR_CLASS = "class"; //$NON-NLS-1$
 
   public static final String NAMESPACE = OM.BUNDLE_ID;
 
-  public static final String EXT_POINT = "elementProcessors";
+  public static final String EXT_POINT = "elementProcessors"; //$NON-NLS-1$
 
   private List<IElementProcessor> processors = new ArrayList<IElementProcessor>();
 
@@ -48,7 +48,7 @@ public class PluginElementProcessorList extends Lifecycle implements List<IEleme
       for (IExtensionDelta delta : deltas)
       {
         // TODO Handle ExtensionDelta
-        OM.LOG.warn("ExtensionDelta not handled: " + delta);
+        OM.LOG.warn("ExtensionDelta not handled: " + delta); //$NON-NLS-1$
       }
     }
   };
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/factory/PluginFactoryRegistry.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/factory/PluginFactoryRegistry.java
index ba1d0f5c70..c13f9fefbd 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/factory/PluginFactoryRegistry.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/factory/PluginFactoryRegistry.java
@@ -30,7 +30,7 @@ public class PluginFactoryRegistry extends HashMapRegistry<IFactoryKey, IFactory
 {
   public static final String NAMESPACE = OM.BUNDLE_ID;
 
-  public static final String EXT_POINT = "factories";
+  public static final String EXT_POINT = "factories"; //$NON-NLS-1$
 
   private IRegistryChangeListener extensionRegistryListener = new IRegistryChangeListener()
   {
@@ -40,7 +40,7 @@ public class PluginFactoryRegistry extends HashMapRegistry<IFactoryKey, IFactory
       for (IExtensionDelta delta : deltas)
       {
         // TODO Handle ExtensionDelta
-        OM.LOG.warn("ExtensionDelta not handled: " + delta);
+        OM.LOG.warn("ExtensionDelta not handled: " + delta); //$NON-NLS-1$
       }
     }
   };
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/LegacyBundle.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/LegacyBundle.java
index 7c369560f0..29f2a725c4 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/LegacyBundle.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/LegacyBundle.java
@@ -49,7 +49,7 @@ public class LegacyBundle extends AbstractBundle
 
   public String getStateLocation()
   {
-    return new File(getPlatform().getStateFolder(), ".plugins/" + getBundleID()).getAbsolutePath();
+    return new File(getPlatform().getStateFolder(), ".plugins/" + getBundleID()).getAbsolutePath(); //$NON-NLS-1$
   }
 
   public URL getBaseURL()
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/ArrayPreference.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/ArrayPreference.java
index f72aa7d7c9..8099d31ae2 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/ArrayPreference.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/ArrayPreference.java
@@ -22,9 +22,9 @@ import java.net.URLEncoder;
  */
 public final class ArrayPreference extends Preference<String[]> implements OMPreference<String[]>
 {
-  private static final String SEPARATOR = ",";
+  private static final String SEPARATOR = ","; //$NON-NLS-1$
 
-  private static final String UTF_8 = "UTF-8";
+  private static final String UTF_8 = "UTF-8"; //$NON-NLS-1$
 
   public ArrayPreference(Preferences preferences, String name, String[] defaultValue)
   {
@@ -46,7 +46,7 @@ public final class ArrayPreference extends Preference<String[]> implements OMPre
       if (builder.length() != 0)
       {
         builder.append(SEPARATOR);
-        builder.append(" ");
+        builder.append(" "); //$NON-NLS-1$
       }
 
       try
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/Preference.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/Preference.java
index 522a00d404..60765745a2 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/Preference.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/Preference.java
@@ -30,7 +30,7 @@ public abstract class Preference<T> implements OMPreference<T>
   {
     if (defaultValue == null)
     {
-      throw new IllegalArgumentException("defaultValue == null");
+      throw new IllegalArgumentException("defaultValue == null"); //$NON-NLS-1$
     }
 
     this.preferences = preferences;
@@ -63,7 +63,7 @@ public abstract class Preference<T> implements OMPreference<T>
   {
     if (value == null)
     {
-      throw new IllegalArgumentException("value == null");
+      throw new IllegalArgumentException("value == null"); //$NON-NLS-1$
     }
 
     load();
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/Preferences.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/Preferences.java
index 33c487d3b5..126445b098 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/Preferences.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/Preferences.java
@@ -109,7 +109,7 @@ public class Preferences extends Notifier implements OMPreferences
         {
           public void run(FileOutputStream io) throws IOException
           {
-            properties.store(io, "Preferences of " + bundle.getBundleID());
+            properties.store(io, "Preferences of " + bundle.getBundleID()); //$NON-NLS-1$
           }
         });
       }
@@ -272,7 +272,7 @@ public class Preferences extends Notifier implements OMPreferences
     String name = preference.getName();
     if (prefs.containsKey(name))
     {
-      throw new IllegalArgumentException("Duplicate name: " + name);
+      throw new IllegalArgumentException("Duplicate name: " + name); //$NON-NLS-1$
     }
 
     prefs.put(name, preference);
@@ -281,10 +281,10 @@ public class Preferences extends Notifier implements OMPreferences
 
   private File getFile()
   {
-    File file = new File(bundle.getStateLocation(), ".prefs");
+    File file = new File(bundle.getStateLocation(), ".prefs"); //$NON-NLS-1$
     if (file.exists() && !file.isFile())
     {
-      throw new IORuntimeException("Not a file: " + file.getAbsolutePath());
+      throw new IORuntimeException("Not a file: " + file.getAbsolutePath()); //$NON-NLS-1$
     }
 
     return file;
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/CheckUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/CheckUtil.java
index d103ddd432..489fa275b0 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/CheckUtil.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/CheckUtil.java
@@ -39,7 +39,7 @@ public final class CheckUtil
   {
     if (handle == null)
     {
-      throw new IllegalArgumentException(handleName + " is null");
+      throw new IllegalArgumentException(handleName + " is null"); //$NON-NLS-1$
     }
   }
 
@@ -55,7 +55,7 @@ public final class CheckUtil
   {
     if (handle == null)
     {
-      throw new IllegalStateException(handleName + " is null");
+      throw new IllegalStateException(handleName + " is null"); //$NON-NLS-1$
     }
   }
 }
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/HexUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/HexUtil.java
index 8b277019c7..011b606231 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/HexUtil.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/HexUtil.java
@@ -113,7 +113,7 @@ public final class HexUtil
 
     if (out.length < off + slen / 2)
     {
-      throw new IndexOutOfBoundsException("Output buffer too small for input (" + out.length + '<' + off + slen / 2
+      throw new IndexOutOfBoundsException("Output buffer too small for input (" + out.length + '<' + off + slen / 2 //$NON-NLS-1$
           + ')');
     }
 
@@ -137,7 +137,7 @@ public final class HexUtil
     final String hex = Long.toHexString(v);
     if (hex.length() < 8)
     {
-      return "00000000".substring(hex.length()) + hex;
+      return "00000000".substring(hex.length()) + hex; //$NON-NLS-1$
     }
 
     return hex;
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ReflectUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ReflectUtil.java
index 16c80bb347..55a9bcdaf4 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ReflectUtil.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ReflectUtil.java
@@ -37,7 +37,7 @@ import java.util.Map.Entry;
  */
 public final class ReflectUtil
 {
-  private static final String NAMESPACE_SEPARATOR = ".";
+  private static final String NAMESPACE_SEPARATOR = "."; //$NON-NLS-1$
 
   public static final Class<Object> ROOT_CLASS = Object.class;
 
@@ -210,7 +210,7 @@ public final class ReflectUtil
     for (int i = 2; i < stackTrace.length; i++)
     {
       StackTraceElement stackTraceElement = stackTrace[i];
-      out.println("\tat " + stackTraceElement);
+      out.println("\tat " + stackTraceElement); //$NON-NLS-1$
     }
   }
 
@@ -317,7 +317,7 @@ public final class ReflectUtil
     String name = object.getClass().getSimpleName();
     if (name.length() == 0)
     {
-      name = "anonymous";
+      name = "anonymous"; //$NON-NLS-1$
     }
 
     return name + "@" + getID(object); //$NON-NLS-1$
@@ -398,7 +398,7 @@ public final class ReflectUtil
           }
           else
           {
-            OM.LOG.warn("Value of classKey " + classKey + " is not a String");
+            OM.LOG.warn("Value of classKey " + classKey + " is not a String"); //$NON-NLS-1$ //$NON-NLS-2$
           }
         }
         else
@@ -410,7 +410,7 @@ public final class ReflectUtil
 
     if (className == null)
     {
-      throw new IllegalArgumentException("Properties do not contain a valid class name for key " + classKey);
+      throw new IllegalArgumentException("Properties do not contain a valid class name for key " + classKey); //$NON-NLS-1$
     }
 
     Class<?> c = classLoader.loadClass(className);
@@ -468,7 +468,7 @@ public final class ReflectUtil
 
           if (value == null)
           {
-            throw new IllegalArgumentException("Value of property " + name + " can not be assigned to type "
+            throw new IllegalArgumentException("Value of property " + name + " can not be assigned to type " //$NON-NLS-1$ //$NON-NLS-2$
                 + type.getName());
           }
 
@@ -487,7 +487,7 @@ public final class ReflectUtil
 
   public static boolean isSetterName(String name)
   {
-    return name.startsWith("set") && name.length() > 3 && Character.isUpperCase(name.charAt(3));
+    return name.startsWith("set") && name.length() > 3 && Character.isUpperCase(name.charAt(3)); //$NON-NLS-1$
   }
 
   public static String toString(Object object)
@@ -549,7 +549,7 @@ public final class ReflectUtil
         builder.append(StringUtil.NL);
         for (Object element : (Collection<?>)value)
         {
-          builder.append("    ");
+          builder.append("    "); //$NON-NLS-1$
           builder.append(element);
           builder.append(StringUtil.NL);
         }
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/StringUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/StringUtil.java
index abb0ddb0ba..69f721cfc1 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/StringUtil.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/StringUtil.java
@@ -18,7 +18,7 @@ import java.io.PrintStream;
  */
 public final class StringUtil
 {
-  public static final String EMPTY = "";
+  public static final String EMPTY = ""; //$NON-NLS-1$
 
   public static final String NL = System.getProperty("line.separator"); //$NON-NLS-1$
 
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/cache/Cache.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/cache/Cache.java
index a7f433835d..5c9bff722a 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/cache/Cache.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/cache/Cache.java
@@ -60,7 +60,7 @@ public abstract class Cache<E> extends Worker implements ICache
     super.doBeforeActivate();
     if (cacheMonitor == null)
     {
-      throw new IllegalStateException("cacheMonitor == null");
+      throw new IllegalStateException("cacheMonitor == null"); //$NON-NLS-1$
     }
   }
 
@@ -102,7 +102,7 @@ public abstract class Cache<E> extends Worker implements ICache
   {
     if (TRACER.isEnabled())
     {
-      TRACER.trace("Unreachable: " + element);
+      TRACER.trace("Unreachable: " + element); //$NON-NLS-1$
     }
   }
 }
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/cache/CacheMonitor.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/cache/CacheMonitor.java
index a3e56c03c3..60e7f037a7 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/cache/CacheMonitor.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/cache/CacheMonitor.java
@@ -108,7 +108,7 @@ public class CacheMonitor extends Worker implements ICacheMonitor
   {
     if (TRACER.isEnabled())
     {
-      TRACER.trace("Registering cache " + cache);
+      TRACER.trace("Registering cache " + cache); //$NON-NLS-1$
     }
 
     ICacheRegistration registration = new CacheRegistration(this, cache);
@@ -139,7 +139,7 @@ public class CacheMonitor extends Worker implements ICacheMonitor
       registration.dispose();
       if (TRACER.isEnabled())
       {
-        TRACER.trace("Deregistered cache " + cache);
+        TRACER.trace("Deregistered cache " + cache); //$NON-NLS-1$
       }
     }
   }
@@ -150,7 +150,7 @@ public class CacheMonitor extends Worker implements ICacheMonitor
     super.doBeforeActivate();
     if (conditionPolicy == null)
     {
-      throw new IllegalStateException("conditionPolicy == null");
+      throw new IllegalStateException("conditionPolicy == null"); //$NON-NLS-1$
     }
   }
 
@@ -193,7 +193,7 @@ public class CacheMonitor extends Worker implements ICacheMonitor
   {
     if (newCondition == null)
     {
-      throw new ImplementationError("newCondition == null");
+      throw new ImplementationError("newCondition == null"); //$NON-NLS-1$
     }
 
     Condition oldCondition = condition;
@@ -206,7 +206,7 @@ public class CacheMonitor extends Worker implements ICacheMonitor
 
   protected void handleConditionRED()
   {
-    OM.LOG.warn("CONDITION RED");
+    OM.LOG.warn("CONDITION RED"); //$NON-NLS-1$
   }
 
   /**
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/cache/CacheRegistration.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/cache/CacheRegistration.java
index 9bbe2f7e2f..cbd9de45b4 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/cache/CacheRegistration.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/cache/CacheRegistration.java
@@ -104,7 +104,7 @@ public class CacheRegistration implements ICacheRegistration
   {
     if (isDisposed())
     {
-      throw new IllegalStateException("disposed");
+      throw new IllegalStateException("disposed"); //$NON-NLS-1$
     }
   }
 }
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/cache/HysteresisConditionPolicy.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/cache/HysteresisConditionPolicy.java
index d4b63ec756..a470b85127 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/cache/HysteresisConditionPolicy.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/cache/HysteresisConditionPolicy.java
@@ -27,17 +27,17 @@ public class HysteresisConditionPolicy extends ThresholdConditionPolicy
     super(thresholdRedYellow, thresholdYellowGreen);
     if (thresholdYellowRed > thresholdRedYellow)
     {
-      throw new IllegalArgumentException("thresholdYellowRed > thresholdRedYellow");
+      throw new IllegalArgumentException("thresholdYellowRed > thresholdRedYellow"); //$NON-NLS-1$
     }
 
     if (thresholdRedYellow > thresholdGreenYellow)
     {
-      throw new IllegalArgumentException("thresholdRedYellow > thresholdGreenYellow");
+      throw new IllegalArgumentException("thresholdRedYellow > thresholdGreenYellow"); //$NON-NLS-1$
     }
 
     if (thresholdGreenYellow > thresholdYellowGreen)
     {
-      throw new IllegalArgumentException("thresholdGreenYellow > thresholdYellowGreen");
+      throw new IllegalArgumentException("thresholdGreenYellow > thresholdYellowGreen"); //$NON-NLS-1$
     }
 
     this.thresholdGreenYellow = thresholdGreenYellow;
@@ -99,7 +99,7 @@ public class HysteresisConditionPolicy extends ThresholdConditionPolicy
       return Condition.RED;
 
     default:
-      throw new IllegalArgumentException("oldCondition == " + oldCondition);
+      throw new IllegalArgumentException("oldCondition == " + oldCondition); //$NON-NLS-1$
     }
   }
 }
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/cache/ThresholdConditionPolicy.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/cache/ThresholdConditionPolicy.java
index f529d8a777..dd005882eb 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/cache/ThresholdConditionPolicy.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/cache/ThresholdConditionPolicy.java
@@ -25,7 +25,7 @@ public class ThresholdConditionPolicy implements ICacheMonitor.ConditionPolicy
   {
     if (thresholdRedYellow > thresholdYellowGreen)
     {
-      throw new IllegalArgumentException("thresholdRedYellow > thresholdYellowGreen");
+      throw new IllegalArgumentException("thresholdRedYellow > thresholdYellowGreen"); //$NON-NLS-1$
     }
 
     this.thresholdRedYellow = thresholdRedYellow;
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/MapEntry.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/MapEntry.java
index a0ab489f90..b206800609 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/MapEntry.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/MapEntry.java
@@ -79,6 +79,6 @@ public class MapEntry<K, V> implements Map.Entry<K, V>
   @Override
   public String toString()
   {
-    return MessageFormat.format("{0}={1}", key, value);
+    return MessageFormat.format("{0}={1}", key, value); //$NON-NLS-1$
   }
 }
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/MoveableArrayList.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/MoveableArrayList.java
index 5d9fac71f2..f1d0e81089 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/MoveableArrayList.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/MoveableArrayList.java
@@ -31,12 +31,12 @@ public class MoveableArrayList<E> extends ArrayList<E> implements MoveableList<E
     int size = size();
     if (sourceIndex >= size)
     {
-      throw new IndexOutOfBoundsException("sourceIndex=" + sourceIndex + ", size=" + size);
+      throw new IndexOutOfBoundsException("sourceIndex=" + sourceIndex + ", size=" + size); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     if (targetIndex >= size)
     {
-      throw new IndexOutOfBoundsException("targetIndex=" + targetIndex + ", size=" + size);
+      throw new IndexOutOfBoundsException("targetIndex=" + targetIndex + ", size=" + size); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     E object = get(sourceIndex);
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/Pair.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/Pair.java
index 35ec0be023..cfdb290e54 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/Pair.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/Pair.java
@@ -86,6 +86,6 @@ public class Pair<T1, T2>
   @Override
   public String toString()
   {
-    return "Pair[" + element1 + ", " + element2 + "]";
+    return "Pair[" + element1 + ", " + element2 + "]"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
   }
 }
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/ConcurrentValue.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/ConcurrentValue.java
index fb56f29d5a..d4a2f803f0 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/ConcurrentValue.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/ConcurrentValue.java
@@ -89,7 +89,7 @@ public final class ConcurrentValue<T>
   {
     if (accept == null)
     {
-      throw new IllegalArgumentException("accept == null");
+      throw new IllegalArgumentException("accept == null"); //$NON-NLS-1$
     }
 
     synchronized (notifier)
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/MonitoredThread.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/MonitoredThread.java
index 51d6d1bdbe..abfe8a53da 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/MonitoredThread.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/MonitoredThread.java
@@ -232,7 +232,7 @@ public abstract class MonitoredThread extends Thread
       }
 
       shutdownThreads();
-      throw new RuntimeException("Idle timeout expired: " + thread.getName());
+      throw new RuntimeException("Idle timeout expired: " + thread.getName()); //$NON-NLS-1$
     }
 
     private void startupThreads()
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/OnePendingExecutor.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/OnePendingExecutor.java
index 972a82e452..e6b1e0438e 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/OnePendingExecutor.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/OnePendingExecutor.java
@@ -26,7 +26,7 @@ public class OnePendingExecutor implements Executor
   {
     if (this.command != null)
     {
-      throw new IllegalStateException("One command already pending");
+      throw new IllegalStateException("One command already pending"); //$NON-NLS-1$
     }
 
     this.command = command;
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/RWLock.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/RWLock.java
index cffae0808c..2e05bc8052 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/RWLock.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/RWLock.java
@@ -75,7 +75,7 @@ public class RWLock extends ReentrantReadWriteLock
         }
       }
 
-      throw new TimeoutException("Acquisition of lock timed out after " + timeoutMillis + " millis");
+      throw new TimeoutException("Acquisition of lock timed out after " + timeoutMillis + " millis"); //$NON-NLS-1$ //$NON-NLS-2$
     }
     catch (Exception ex)
     {
@@ -101,7 +101,7 @@ public class RWLock extends ReentrantReadWriteLock
       }
       else
       {
-        throw new TimeoutException("Acquisition of lock timed out after " + timeoutMillis + " millis");
+        throw new TimeoutException("Acquisition of lock timed out after " + timeoutMillis + " millis"); //$NON-NLS-1$ //$NON-NLS-2$
       }
     }
     catch (InterruptedException ignore)
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/RWLockManager.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/RWLockManager.java
index ce63d47ede..92ec699624 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/RWLockManager.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/RWLockManager.java
@@ -256,7 +256,7 @@ public class RWLockManager<K, V> extends Lifecycle
         long elapsedTime = System.currentTimeMillis() - startTime;
         if (timeout != WAIT && elapsedTime > timeout)
         {
-          throw new TimeoutRuntimeException("Conflict with " + conflict);
+          throw new TimeoutRuntimeException("Conflict with " + conflict); //$NON-NLS-1$
         }
 
         if (timeout == WAIT)
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/SynchronizingCorrelator.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/SynchronizingCorrelator.java
index 9db1b77914..3f71659396 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/SynchronizingCorrelator.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/SynchronizingCorrelator.java
@@ -98,6 +98,6 @@ public class SynchronizingCorrelator<CORRELATION, RESULT> implements ICorrelator
   @Override
   public String toString()
   {
-    return "SynchronizingCorrelator" + map;
+    return "SynchronizingCorrelator" + map; //$NON-NLS-1$
   }
 }
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/Worker.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/Worker.java
index 9e44a67941..fbd7388659 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/Worker.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/Worker.java
@@ -91,7 +91,7 @@ public abstract class Worker extends Lifecycle
       {
       }
 
-      throw new TimeoutException("Worker thread activation timed out after " + activationTimeout + " millis");
+      throw new TimeoutException("Worker thread activation timed out after " + activationTimeout + " millis"); //$NON-NLS-1$ //$NON-NLS-2$
     }
   }
 
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ContainerEvent.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ContainerEvent.java
index 3e71622ab4..50d4d191f0 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ContainerEvent.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ContainerEvent.java
@@ -59,7 +59,7 @@ public class ContainerEvent<E> extends Event implements IContainerEvent<E>
   {
     if (deltas.size() != 1)
     {
-      throw new IllegalStateException("deltas.size() != 1");
+      throw new IllegalStateException("deltas.size() != 1"); //$NON-NLS-1$
     }
 
     return deltas.get(0);
@@ -118,12 +118,12 @@ public class ContainerEvent<E> extends Event implements IContainerEvent<E>
     StringBuilder builder = new StringBuilder();
     for (IContainerDelta<E> delta : getDeltas())
     {
-      builder.append(", ");
+      builder.append(", "); //$NON-NLS-1$
       builder.append(delta.getKind());
-      builder.append("=");
+      builder.append("="); //$NON-NLS-1$
       builder.append(delta.getElement());
     }
 
-    return MessageFormat.format("ContainerEvent[source={0}{1}]", getSource(), builder.toString());
+    return MessageFormat.format("ContainerEvent[source={0}{1}]", getSource(), builder.toString()); //$NON-NLS-1$
   }
 }
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ContainerUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ContainerUtil.java
index fe14be2284..0c1172d8b5 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ContainerUtil.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ContainerUtil.java
@@ -42,7 +42,7 @@ public final class ContainerUtil
     @Override
     public String toString()
     {
-      return "EMPTY_CONTAINER";
+      return "EMPTY_CONTAINER"; //$NON-NLS-1$
     }
   };
 
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ManagedContainer.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ManagedContainer.java
index 671a38ef26..89f7a09e04 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ManagedContainer.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ManagedContainer.java
@@ -190,7 +190,7 @@ public class ManagedContainer extends Lifecycle implements IManagedContainer
     IFactory factory = getFactoryRegistry().get(key);
     if (factory == null)
     {
-      throw new FactoryNotFoundException("Factory not found: " + key);
+      throw new FactoryNotFoundException("Factory not found: " + key); //$NON-NLS-1$
     }
 
     return factory;
@@ -438,7 +438,7 @@ public class ManagedContainer extends Lifecycle implements IManagedContainer
   @Override
   public String toString()
   {
-    return "ManagedContainer";
+    return "ManagedContainer"; //$NON-NLS-1$
   }
 
   protected IRegistry<IFactoryKey, IFactory> createFactoryRegistry()
@@ -617,7 +617,7 @@ public class ManagedContainer extends Lifecycle implements IManagedContainer
     @Override
     public String toString()
     {
-      return MessageFormat.format("{0}[{1}, {2}]", productGroup, factoryType, description);
+      return MessageFormat.format("{0}[{1}, {2}]", productGroup, factoryType, description); //$NON-NLS-1$
     }
 
     public int compareTo(ElementKey key)
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/SingleDeltaContainerEvent.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/SingleDeltaContainerEvent.java
index 42355ccc97..fdc631c169 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/SingleDeltaContainerEvent.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/SingleDeltaContainerEvent.java
@@ -89,6 +89,6 @@ public class SingleDeltaContainerEvent<E> extends Event implements IContainerEve
   @Override
   public String toString()
   {
-    return MessageFormat.format("ContainerEvent[source={0}, {1}={2}]", getSource(), getDeltaElement(), getDeltaKind());
+    return MessageFormat.format("ContainerEvent[source={0}, {1}={2}]", getSource(), getDeltaElement(), getDeltaKind()); //$NON-NLS-1$
   }
 }
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/Notifier.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/Notifier.java
index 9c54d156ad..cbbe4b0594 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/Notifier.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/Notifier.java
@@ -33,7 +33,7 @@ public class Notifier implements INotifier.Introspection
 
   public void addListener(IListener listener)
   {
-    CheckUtil.checkArg(listener, "listener");
+    CheckUtil.checkArg(listener, "listener"); //$NON-NLS-1$
     boolean wasNotEmpty;
     boolean isNotEmpty;
     synchronized (listeners)
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/Factory.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/Factory.java
index 26c92be35c..6182ae3881 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/Factory.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/Factory.java
@@ -52,6 +52,6 @@ public abstract class Factory implements IFactory
   @Override
   public String toString()
   {
-    return MessageFormat.format("Factory[{0}, {1}]", getProductGroup(), getType());
+    return MessageFormat.format("Factory[{0}, {1}]", getProductGroup(), getType()); //$NON-NLS-1$
   }
 }
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/FactoryDescriptor.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/FactoryDescriptor.java
index 2fe83fa012..ef9dd3f221 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/FactoryDescriptor.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/FactoryDescriptor.java
@@ -18,11 +18,11 @@ import org.eclipse.core.runtime.IConfigurationElement;
  */
 public class FactoryDescriptor extends Factory
 {
-  private static final String ATTR_PRODUCT_GROUP = "productGroup";
+  private static final String ATTR_PRODUCT_GROUP = "productGroup"; //$NON-NLS-1$
 
-  private static final String ATTR_TYPE = "type";
+  private static final String ATTR_TYPE = "type"; //$NON-NLS-1$
 
-  private static final String ATTR_CLASS = "class";
+  private static final String ATTR_CLASS = "class"; //$NON-NLS-1$
 
   private IConfigurationElement configurationElement;
 
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/FactoryKey.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/FactoryKey.java
index 327260cdce..6dfb46a7ce 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/FactoryKey.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/FactoryKey.java
@@ -79,7 +79,7 @@ public final class FactoryKey implements IFactoryKey, Serializable, Comparable<F
   @Override
   public String toString()
   {
-    return MessageFormat.format("{0}[{1}]", productGroup, type);
+    return MessageFormat.format("{0}[{1}]", productGroup, type); //$NON-NLS-1$
   }
 
   public int compareTo(FactoryKey key)
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/fsm/FiniteStateMachine.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/fsm/FiniteStateMachine.java
index d000a4a68a..54bd99a510 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/fsm/FiniteStateMachine.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/fsm/FiniteStateMachine.java
@@ -31,11 +31,11 @@ public abstract class FiniteStateMachine<STATE extends Enum<?>, EVENT extends En
 
   private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG, FiniteStateMachine.class);
 
-  private static final String MSG_PROCESS = "Processing event {0} in state {1} for {2} (data={3})";
+  private static final String MSG_PROCESS = "Processing event {0} in state {1} for {2} (data={3})"; //$NON-NLS-1$
 
-  private static final String MSG_IGNORE = "Ignoring event {0} in state {1} for {2} (data={3})";
+  private static final String MSG_IGNORE = "Ignoring event {0} in state {1} for {2} (data={3})"; //$NON-NLS-1$
 
-  private static final String MSG_FAIL = "Failing event {0} in state {1} for {2} (data={3})";
+  private static final String MSG_FAIL = "Failing event {0} in state {1} for {2} (data={3})"; //$NON-NLS-1$
 
   private STATE[] states;
 
@@ -207,7 +207,7 @@ public abstract class FiniteStateMachine<STATE extends Enum<?>, EVENT extends En
   {
     if (transition == null)
     {
-      throw new IllegalArgumentException("transition == null");
+      throw new IllegalArgumentException("transition == null"); //$NON-NLS-1$
     }
   }
 
@@ -224,7 +224,7 @@ public abstract class FiniteStateMachine<STATE extends Enum<?>, EVENT extends En
     @Override
     public String toString()
     {
-      return "IGNORE";
+      return "IGNORE"; //$NON-NLS-1$
     }
   }
 
@@ -241,7 +241,7 @@ public abstract class FiniteStateMachine<STATE extends Enum<?>, EVENT extends En
     @Override
     public String toString()
     {
-      return "FAIL";
+      return "FAIL"; //$NON-NLS-1$
     }
   }
 
@@ -270,7 +270,7 @@ public abstract class FiniteStateMachine<STATE extends Enum<?>, EVENT extends En
     @Override
     public String toString()
     {
-      return MessageFormat.format("CHANGE_STATE[{0}]", targetState);
+      return MessageFormat.format("CHANGE_STATE[{0}]", targetState); //$NON-NLS-1$
     }
   }
 
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedIOUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedIOUtil.java
index cc97755212..3aa3658fd0 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedIOUtil.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedIOUtil.java
@@ -114,7 +114,7 @@ public final class ExtendedIOUtil
     }
     catch (Throwable t)
     {
-      throw new IOException("Unable to allocate " + length + " bytes");
+      throw new IOException("Unable to allocate " + length + " bytes"); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     in.readFully(b);
@@ -157,7 +157,7 @@ public final class ExtendedIOUtil
           {
             if (TRACER.isEnabled())
             {
-              TRACER.format("Deserializing class {0}", desc.getName());
+              TRACER.format("Deserializing class {0}", desc.getName()); //$NON-NLS-1$
             }
 
             Class<?> c = classResolver.resolveClass(desc);
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/GZIPStreamWrapper.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/GZIPStreamWrapper.java
index 44955af6f2..3ceae11163 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/GZIPStreamWrapper.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/GZIPStreamWrapper.java
@@ -67,7 +67,7 @@ public class GZIPStreamWrapper implements IStreamWrapper
     final PipedInputStream pis = new PipedInputStream(pos);
 
     final GZIPOutputStream gos = new GZIPOutputStream(pos);
-    final byte[] out = "eike".getBytes();
+    final byte[] out = "eike".getBytes(); //$NON-NLS-1$
 
     Thread thread = new Thread()
     {
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IOUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IOUtil.java
index 8b155d26bf..ef01267907 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IOUtil.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IOUtil.java
@@ -41,17 +41,17 @@ public final class IOUtil
   /**
    * @since 2.0
    */
-  public static final String WILDCARD_SINGLE_CHAR = "?";
+  public static final String WILDCARD_SINGLE_CHAR = "?"; //$NON-NLS-1$
 
   /**
    * @since 2.0
    */
-  public static final String WILDCARD_MULTI_CHARS = "*";
+  public static final String WILDCARD_MULTI_CHARS = "*"; //$NON-NLS-1$
 
   /**
    * @since 2.0
    */
-  public static final String WILDCARD_MULTI_DIRS = "**";
+  public static final String WILDCARD_MULTI_DIRS = "**"; //$NON-NLS-1$
 
   private static final char SEP = File.separatorChar;
 
@@ -233,7 +233,7 @@ public final class IOUtil
       return relative;
     }
 
-    throw new IllegalArgumentException("Different prefixes: " + fileName + " != " + folderName);
+    throw new IllegalArgumentException("Different prefixes: " + fileName + " != " + folderName); //$NON-NLS-1$ //$NON-NLS-2$
   }
 
   /**
@@ -259,7 +259,7 @@ public final class IOUtil
     {
       if (!folder.mkdirs())
       {
-        throw new IORuntimeException("Unable to create directory " + folder.getAbsolutePath());
+        throw new IORuntimeException("Unable to create directory " + folder.getAbsolutePath()); //$NON-NLS-1$
       }
     }
   }
@@ -430,7 +430,7 @@ public final class IOUtil
   {
     if (file.length() > Integer.MAX_VALUE)
     {
-      throw new IllegalArgumentException("File too long: " + file.length());
+      throw new IllegalArgumentException("File too long: " + file.length()); //$NON-NLS-1$
     }
 
     int size = (int)file.length();
@@ -662,7 +662,7 @@ public final class IOUtil
     {
       if (!segment.equals(WILDCARD_MULTI_DIRS))
       {
-        throw new IllegalArgumentException("Invalid pattern segment: " + segment);
+        throw new IllegalArgumentException("Invalid pattern segment: " + segment); //$NON-NLS-1$
       }
 
       multiDirs = true;
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/NIOUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/NIOUtil.java
index ea8b84d9f1..6394ae0acb 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/NIOUtil.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/NIOUtil.java
@@ -56,7 +56,7 @@ public final class NIOUtil
       long transfered = sourceChannel.transferTo(0, size, targetChannel);
       if (transfered != size)
       {
-        throw new ImplementationError("Seems as if a loop must be implemented here");
+        throw new ImplementationError("Seems as if a loop must be implemented here"); //$NON-NLS-1$
       }
     }
     catch (IOException ex)
@@ -89,7 +89,7 @@ public final class NIOUtil
     long q = System.currentTimeMillis();
     if (!src.isFile() || !src.exists())
     {
-      throw new IllegalArgumentException("Source file '" + src.getAbsolutePath() + "' not found!");
+      throw new IllegalArgumentException("Source file '" + src.getAbsolutePath() + "' not found!"); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     if (dst.exists())
@@ -103,12 +103,12 @@ public final class NIOUtil
       {
         if (!overwrite)
         {
-          throw new IllegalArgumentException("Destination file '" + dst.getAbsolutePath() + "' already exists!");
+          throw new IllegalArgumentException("Destination file '" + dst.getAbsolutePath() + "' already exists!"); //$NON-NLS-1$ //$NON-NLS-2$
         }
       }
       else
       {
-        throw new IllegalArgumentException("Invalid destination object '" + dst.getAbsolutePath() + "'!");
+        throw new IllegalArgumentException("Invalid destination object '" + dst.getAbsolutePath() + "'!"); //$NON-NLS-1$ //$NON-NLS-2$
       }
     }
 
@@ -117,7 +117,7 @@ public final class NIOUtil
     {
       if (!dstParent.mkdirs())
       {
-        throw new IOException("Failed to create directory " + dstParent.getAbsolutePath());
+        throw new IOException("Failed to create directory " + dstParent.getAbsolutePath()); //$NON-NLS-1$
       }
     }
 
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/StringCompressor.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/StringCompressor.java
index 6e1923450e..b7a5911d91 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/StringCompressor.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/StringCompressor.java
@@ -170,7 +170,7 @@ public class StringCompressor implements StringIO
           break;
 
         default:
-          throw new IOException("Invalid info: " + info);
+          throw new IOException("Invalid info: " + info); //$NON-NLS-1$
         }
       }
     }
@@ -190,7 +190,7 @@ public class StringCompressor implements StringIO
         string = idToString.get(id);
         if (string == null)
         {
-          throw new IOException("String ID unknown: " + id);
+          throw new IOException("String ID unknown: " + id); //$NON-NLS-1$
         }
       }
     }
@@ -201,7 +201,7 @@ public class StringCompressor implements StringIO
   @Override
   public String toString()
   {
-    return MessageFormat.format("StringCompressor[client={0}]", client);
+    return MessageFormat.format("StringCompressor[client={0}]", client); //$NON-NLS-1$
   }
 
   private void acknowledge(List<Integer> acks)
@@ -259,7 +259,7 @@ public class StringCompressor implements StringIO
     {
       if (DEBUG_BYTE != in.readByte())
       {
-        throw new IOException("Not a byte value");
+        throw new IOException("Not a byte value"); //$NON-NLS-1$
       }
     }
 
@@ -272,7 +272,7 @@ public class StringCompressor implements StringIO
     {
       if (DEBUG_INT != in.readByte())
       {
-        throw new IOException("Not an integer value");
+        throw new IOException("Not an integer value"); //$NON-NLS-1$
       }
     }
 
@@ -285,7 +285,7 @@ public class StringCompressor implements StringIO
     {
       if (DEBUG_STRING != in.readByte())
       {
-        throw new IOException("Not a string value");
+        throw new IOException("Not a string value"); //$NON-NLS-1$
       }
     }
 
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/StringIO.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/StringIO.java
index 68498ce414..503f9529ff 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/StringIO.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/StringIO.java
@@ -33,7 +33,7 @@ public interface StringIO
     @Override
     public String toString()
     {
-      return "DIRECT";
+      return "DIRECT"; //$NON-NLS-1$
     }
   };
 
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/TMPUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/TMPUtil.java
index 1464c2e361..5c3730cd0a 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/TMPUtil.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/TMPUtil.java
@@ -21,7 +21,7 @@ public final class TMPUtil
   /**
    * @since 2.0
    */
-  public static final String SYSTEM_TEMP_FOLDER = System.getProperty("java.io.tmpdir");
+  public static final String SYSTEM_TEMP_FOLDER = System.getProperty("java.io.tmpdir"); //$NON-NLS-1$
 
   private TMPUtil()
   {
@@ -29,12 +29,12 @@ public final class TMPUtil
 
   public static File createTempFolder() throws IORuntimeException
   {
-    return createTempFolder("tmp");
+    return createTempFolder("tmp"); //$NON-NLS-1$
   }
 
   public static File createTempFolder(String prefix) throws IORuntimeException
   {
-    return createTempFolder(prefix, "");
+    return createTempFolder(prefix, ""); //$NON-NLS-1$
   }
 
   public static File createTempFolder(String prefix, String suffix) throws IORuntimeException
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ZIPUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ZIPUtil.java
index 4c3840a4b5..1f8ba5b8a9 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ZIPUtil.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ZIPUtil.java
@@ -72,7 +72,7 @@ public final class ZIPUtil
             input = context.getInputStream();
             if (input == null)
             {
-              throw new IllegalStateException("Input is null for zip entry " + name);
+              throw new IllegalStateException("Input is null for zip entry " + name); //$NON-NLS-1$
             }
 
             IOUtil.copy(input, zos, buffer);
@@ -208,7 +208,7 @@ public final class ZIPUtil
 
     public void setName(String name, boolean directory)
     {
-      this.name = name + (directory ? "/" : "");
+      this.name = name + (directory ? "/" : ""); //$NON-NLS-1$ //$NON-NLS-2$
       this.directory = directory;
     }
 
@@ -259,12 +259,12 @@ public final class ZIPUtil
             if (f2.isDirectory())
             {
               // f1=dir, f2=dir
-              if (path1.equalsIgnoreCase("/META-INF"))
+              if (path1.equalsIgnoreCase("/META-INF")) //$NON-NLS-1$
               {
                 return ORDER_KEEP;
               }
 
-              if (path2.equalsIgnoreCase("/META-INF"))
+              if (path2.equalsIgnoreCase("/META-INF")) //$NON-NLS-1$
               {
                 return ORDER_SWAP;
               }
@@ -273,12 +273,12 @@ public final class ZIPUtil
             }
 
             // f1=dir, f2=file
-            if (path1.equalsIgnoreCase("/META-INF"))
+            if (path1.equalsIgnoreCase("/META-INF")) //$NON-NLS-1$
             {
               return ORDER_KEEP;
             }
 
-            if (path2.equalsIgnoreCase("/META-INF/MANIFEST.MF"))
+            if (path2.equalsIgnoreCase("/META-INF/MANIFEST.MF")) //$NON-NLS-1$
             {
               return ORDER_SWAP;
             }
@@ -289,12 +289,12 @@ public final class ZIPUtil
           if (f2.isDirectory())
           {
             // f1=file, f2=dir
-            if (path2.equalsIgnoreCase("/META-INF"))
+            if (path2.equalsIgnoreCase("/META-INF")) //$NON-NLS-1$
             {
               return ORDER_SWAP;
             }
 
-            if (path1.equalsIgnoreCase("/META-INF/MANIFEST.MF"))
+            if (path1.equalsIgnoreCase("/META-INF/MANIFEST.MF")) //$NON-NLS-1$
             {
               return ORDER_KEEP;
             }
@@ -303,12 +303,12 @@ public final class ZIPUtil
           }
 
           // f1=file, f2=file
-          if (path1.equalsIgnoreCase("/META-INF/MANIFEST.MF"))
+          if (path1.equalsIgnoreCase("/META-INF/MANIFEST.MF")) //$NON-NLS-1$
           {
             return ORDER_KEEP;
           }
 
-          if (path2.equalsIgnoreCase("/META-INF/MANIFEST.MF"))
+          if (path2.equalsIgnoreCase("/META-INF/MANIFEST.MF")) //$NON-NLS-1$
           {
             return ORDER_SWAP;
           }
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/Lifecycle.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/Lifecycle.java
index eb4e0ee497..02ea61dc6f 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/Lifecycle.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/Lifecycle.java
@@ -51,7 +51,7 @@ public class Lifecycle extends Notifier implements ILifecycle.Introspection
       {
         if (TRACER.isEnabled())
         {
-          TRACER.trace("Activating " + this);
+          TRACER.trace("Activating " + this); //$NON-NLS-1$
         }
 
         lock();
@@ -74,7 +74,7 @@ public class Lifecycle extends Notifier implements ILifecycle.Introspection
         {
           if (TRACER.isEnabled())
           {
-            TRACER.format("Ignoring activation in state {0} for {1}", lifecycleState, this);
+            TRACER.format("Ignoring activation in state {0} for {1}", lifecycleState, this); //$NON-NLS-1$
           }
         }
       }
@@ -99,7 +99,7 @@ public class Lifecycle extends Notifier implements ILifecycle.Introspection
       {
         if (TRACER.isEnabled())
         {
-          TRACER.trace("Deactivating " + this);
+          TRACER.trace("Deactivating " + this); //$NON-NLS-1$
         }
 
         lock();
@@ -118,7 +118,7 @@ public class Lifecycle extends Notifier implements ILifecycle.Introspection
       {
         if (TRACER.isEnabled())
         {
-          TRACER.format("Ignoring deactivation in state {0} for {1}", lifecycleState, this);
+          TRACER.format("Ignoring deactivation in state {0} for {1}", lifecycleState, this); //$NON-NLS-1$
         }
       }
 
@@ -157,7 +157,7 @@ public class Lifecycle extends Notifier implements ILifecycle.Introspection
   {
     if (DUMPER.isEnabled())
     {
-      DUMPER.trace("DUMP" + ReflectUtil.toString(this));
+      DUMPER.trace("DUMP" + ReflectUtil.toString(this)); //$NON-NLS-1$
     }
   }
 
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/LifecycleUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/LifecycleUtil.java
index 25e43746eb..f6390f9005 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/LifecycleUtil.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/LifecycleUtil.java
@@ -63,7 +63,7 @@ public final class LifecycleUtil
   {
     if (!isActive(object))
     {
-      throw new IllegalStateException("Not active: " + object);
+      throw new IllegalStateException("Not active: " + object); //$NON-NLS-1$
     }
   }
 
@@ -74,7 +74,7 @@ public final class LifecycleUtil
   {
     if (isActive(object))
     {
-      throw new IllegalStateException("Not inactive: " + object);
+      throw new IllegalStateException("Not inactive: " + object); //$NON-NLS-1$
     }
   }
 
@@ -321,13 +321,13 @@ public final class LifecycleUtil
     public Object invoke(Object proxy, Method method, Object[] args) throws Throwable
     {
       String name = method.getName();
-      if (name.equals("activate"))
+      if (name.equals("activate")) //$NON-NLS-1$
       {
         delegate.activate();
         return null;
       }
 
-      if (name.equals("deactivate"))
+      if (name.equals("deactivate")) //$NON-NLS-1$
       {
         return delegate.deactivate();
       }
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OSGiActivator.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OSGiActivator.java
index 7b275494ef..2741c0fb9f 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OSGiActivator.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OSGiActivator.java
@@ -44,7 +44,7 @@ public abstract class OSGiActivator implements BundleActivator
     OSGiActivator.traceStart(context);
     if (omBundle == null)
     {
-      throw new IllegalStateException("bundle == null");
+      throw new IllegalStateException("bundle == null"); //$NON-NLS-1$
     }
 
     try
@@ -70,7 +70,7 @@ public abstract class OSGiActivator implements BundleActivator
     OSGiActivator.traceStop(context);
     if (omBundle == null)
     {
-      throw new IllegalStateException("bundle == null");
+      throw new IllegalStateException("bundle == null"); //$NON-NLS-1$
     }
 
     try
@@ -144,7 +144,7 @@ public abstract class OSGiActivator implements BundleActivator
     {
       if (OM.TRACER.isEnabled())
       {
-        OM.TRACER.format("Starting bundle {0}", context.getBundle().getSymbolicName());
+        OM.TRACER.format("Starting bundle {0}", context.getBundle().getSymbolicName()); //$NON-NLS-1$
       }
     }
     catch (RuntimeException ignore)
@@ -161,7 +161,7 @@ public abstract class OSGiActivator implements BundleActivator
     {
       if (OM.TRACER.isEnabled())
       {
-        OM.TRACER.format("Stopping bundle {0}", context.getBundle().getSymbolicName());
+        OM.TRACER.format("Stopping bundle {0}", context.getBundle().getSymbolicName()); //$NON-NLS-1$
       }
     }
     catch (RuntimeException ignore)
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OSGiApplication.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OSGiApplication.java
index 3b1bc1d38b..1dfad76ca9 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OSGiApplication.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OSGiApplication.java
@@ -117,7 +117,7 @@ public class OSGiApplication implements IApplication
     {
       if (TRACER.isEnabled())
       {
-        TRACER.format("Starting application {0}", applicationID);
+        TRACER.format("Starting application {0}", applicationID); //$NON-NLS-1$
       }
     }
     catch (RuntimeException ignore)
@@ -131,7 +131,7 @@ public class OSGiApplication implements IApplication
     {
       if (TRACER.isEnabled())
       {
-        TRACER.format("Stopping application {0}", applicationID);
+        TRACER.format("Stopping application {0}", applicationID); //$NON-NLS-1$
       }
     }
     catch (RuntimeException ignore)
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/AbstractMonitor.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/AbstractMonitor.java
index ebe8c35fe2..5c7cb3471e 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/AbstractMonitor.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/AbstractMonitor.java
@@ -130,7 +130,7 @@ public abstract class AbstractMonitor implements OMMonitor
   {
     if (!hasBegun())
     {
-      throw new IllegalStateException("begin() has not been called");
+      throw new IllegalStateException("begin() has not been called"); //$NON-NLS-1$
     }
   }
 
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/Monitor.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/Monitor.java
index 3a02f780fb..6af20fb11b 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/Monitor.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/Monitor.java
@@ -72,7 +72,7 @@ public class Monitor extends AbstractMonitor
     {
       if (TIMER == null)
       {
-        TIMER = new Timer("monitor-timer", true);
+        TIMER = new Timer("monitor-timer", true); //$NON-NLS-1$
       }
 
       return TIMER;
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/ProgressDistributor.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/ProgressDistributor.java
index da568361e1..9a2b369a77 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/ProgressDistributor.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/ProgressDistributor.java
@@ -44,7 +44,7 @@ public abstract class ProgressDistributor
       }
       else
       {
-        CheckUtil.checkArg(distribution.length == distributables.length, "distributables.length");
+        CheckUtil.checkArg(distribution.length == distributables.length, "distributables.length"); //$NON-NLS-1$
       }
 
       distributionCopy = new double[distribution.length];
@@ -59,16 +59,16 @@ public abstract class ProgressDistributor
 
     if (TRACER.isEnabled())
     {
-      StringBuilder builder = new StringBuilder("Distribution: ");
+      StringBuilder builder = new StringBuilder("Distribution: "); //$NON-NLS-1$
       for (int i = 0; i < distributionCopy.length; i++)
       {
         builder.append(distributionCopy[i] * OMMonitor.HUNDRED / total);
-        builder.append("%, ");
+        builder.append("%, "); //$NON-NLS-1$
       }
 
-      builder.append("(");
+      builder.append("("); //$NON-NLS-1$
       builder.append(this);
-      builder.append(")");
+      builder.append(")"); //$NON-NLS-1$
       TRACER.trace(builder.toString());
     }
 
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/TimeoutMonitor.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/TimeoutMonitor.java
index b7990b2522..f27f5c0cf9 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/TimeoutMonitor.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/TimeoutMonitor.java
@@ -105,7 +105,7 @@ public class TimeoutMonitor extends Monitor
 
   protected void handleTimeout(long untouched)
   {
-    cancel(new TimeoutRuntimeException("Timeout after " + untouched + " millis"));
+    cancel(new TimeoutRuntimeException("Timeout after " + untouched + " millis")); //$NON-NLS-1$ //$NON-NLS-2$
   }
 
   private void scheduleTimeout()
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/pref/OMPreferences.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/pref/OMPreferences.java
index 6e632918d4..57af139513 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/pref/OMPreferences.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/pref/OMPreferences.java
@@ -28,7 +28,7 @@ public interface OMPreferences extends INotifier
 
   public static final double DEFAULT_DOUBLE = 0.0d;
 
-  public static final String DEFAULT_STRING = "";
+  public static final String DEFAULT_STRING = ""; //$NON-NLS-1$
 
   public static final String[] DEFAULT_ARRAY = {};
 
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/PerfTracer.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/PerfTracer.java
index 52c3130d7f..fa29358fdc 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/PerfTracer.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/PerfTracer.java
@@ -44,7 +44,7 @@ public class PerfTracer extends ContextTracer
       if (timer != null)
       {
         duration = System.currentTimeMillis() - timer;
-        format("{0} = {1} millis", object, duration);
+        format("{0} = {1} millis", object, duration); //$NON-NLS-1$
       }
     }
 
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/PrintTraceHandler.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/PrintTraceHandler.java
index 6a69dc9b8a..a32c6eb9ad 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/PrintTraceHandler.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/PrintTraceHandler.java
@@ -88,7 +88,7 @@ public class PrintTraceHandler implements OMTraceHandler
   {
     Class<?> context = event.getContext();
     String contextName = shortContext ? context.getSimpleName() : context.getName();
-    return Thread.currentThread().getName() + " [" + contextName + "] " + event.getMessage();
+    return Thread.currentThread().getName() + " [" + contextName + "] " + event.getMessage(); //$NON-NLS-1$ //$NON-NLS-2$
   }
 
   /**
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/RemoteTraceHandler.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/RemoteTraceHandler.java
index ac487ea038..14428f746f 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/RemoteTraceHandler.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/RemoteTraceHandler.java
@@ -87,7 +87,7 @@ public class RemoteTraceHandler implements OMTraceHandler
       writeUTF(out, agentID);
       writeUTF(out, event.getTracer().getBundle().getBundleID());
       writeUTF(out, event.getTracer().getFullName());
-      writeUTF(out, event.getContext() == null ? "" : event.getContext().getName());
+      writeUTF(out, event.getContext() == null ? "" : event.getContext().getName()); //$NON-NLS-1$
       writeUTF(out, event.getMessage());
       if (event.getThrowable() == null)
       {
@@ -128,7 +128,7 @@ public class RemoteTraceHandler implements OMTraceHandler
 
   protected void writeUTF(DataOutputStream out, String str) throws IOException
   {
-    out.writeUTF(str == null ? "" : str);
+    out.writeUTF(str == null ? "" : str); //$NON-NLS-1$
   }
 
   public static String uniqueAgentID()
@@ -136,7 +136,7 @@ public class RemoteTraceHandler implements OMTraceHandler
     try
     {
       InetAddress localMachine = InetAddress.getLocalHost();
-      return localMachine.getHostName() + "#" + ++uniqueCounter;
+      return localMachine.getHostName() + "#" + ++uniqueCounter; //$NON-NLS-1$
     }
     catch (Exception ex)
     {
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/RemoteTraceServer.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/RemoteTraceServer.java
index 387f23a534..26a13168ca 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/RemoteTraceServer.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/RemoteTraceServer.java
@@ -61,7 +61,7 @@ public class RemoteTraceServer
     this.port = port;
     this.address = address;
     serverSocket = bind();
-    new Thread("RemoteTraceServer")
+    new Thread("RemoteTraceServer") //$NON-NLS-1$
     {
       @Override
       public void run()
@@ -277,28 +277,28 @@ public class RemoteTraceServer
     public String toString()
     {
       StringBuilder builder = new StringBuilder();
-      builder.append("TraceEvent[agentID=");
+      builder.append("TraceEvent[agentID="); //$NON-NLS-1$
       builder.append(agentID);
 
-      builder.append(", bundleID=");
+      builder.append(", bundleID="); //$NON-NLS-1$
       builder.append(bundleID);
 
-      builder.append(", tracerName=");
+      builder.append(", tracerName="); //$NON-NLS-1$
       builder.append(tracerName);
 
-      builder.append(", context=");
+      builder.append(", context="); //$NON-NLS-1$
       builder.append(context);
 
-      builder.append(", message=");
+      builder.append(", message="); //$NON-NLS-1$
       builder.append(message);
 
-      builder.append(", throwable=");
+      builder.append(", throwable="); //$NON-NLS-1$
       builder.append(throwable);
 
-      builder.append(", stackTrace=");
+      builder.append(", stackTrace="); //$NON-NLS-1$
       builder.append(stackTrace);
 
-      builder.append("]");
+      builder.append("]"); //$NON-NLS-1$
       return builder.toString();
     }
 
@@ -324,7 +324,7 @@ public class RemoteTraceServer
         return throwable;
       }
 
-      throw new IllegalArgumentException("Invalid index: " + index);
+      throw new IllegalArgumentException("Invalid index: " + index); //$NON-NLS-1$
     }
 
     public boolean hasError()
@@ -360,7 +360,7 @@ public class RemoteTraceServer
 
     public void notifyRemoteTrace(Event event)
     {
-      stream.println("[TRACE] " + event.getAgentID());
+      stream.println("[TRACE] " + event.getAgentID()); //$NON-NLS-1$
       stream.println(event.getBundleID());
       stream.println(event.getTracerName());
       stream.println(event.getContext());
@@ -378,10 +378,10 @@ public class RemoteTraceServer
         for (StackTraceElement element : stackTrace)
         {
           stream.print(element.getClassName());
-          stream.print("." + element.getMethodName());
-          stream.print("(" + element.getFileName());
-          stream.print(":" + element.getLineNumber());
-          stream.println(")");
+          stream.print("." + element.getMethodName()); //$NON-NLS-1$
+          stream.print("(" + element.getFileName()); //$NON-NLS-1$
+          stream.print(":" + element.getLineNumber()); //$NON-NLS-1$
+          stream.println(")"); //$NON-NLS-1$
         }
       }
 
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/TraceHandlerEvent.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/TraceHandlerEvent.java
index afcbc8a188..070dad7d8c 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/TraceHandlerEvent.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/TraceHandlerEvent.java
@@ -33,12 +33,12 @@ public class TraceHandlerEvent implements OMTraceHandlerEvent, Serializable
   {
     if (tracer == null)
     {
-      throw new IllegalArgumentException("tracer == null");
+      throw new IllegalArgumentException("tracer == null"); //$NON-NLS-1$
     }
 
     if (context == null)
     {
-      throw new IllegalArgumentException("context == null");
+      throw new IllegalArgumentException("context == null"); //$NON-NLS-1$
     }
 
     timeStamp = System.currentTimeMillis();
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/KeyedPhantomReference.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/KeyedPhantomReference.java
index d3a7b2b84a..49e9defaed 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/KeyedPhantomReference.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/KeyedPhantomReference.java
@@ -40,6 +40,6 @@ public class KeyedPhantomReference<K, T> extends PhantomReference<T> implements
   @Override
   public String toString()
   {
-    return MessageFormat.format("KeyedPhantomReference[{0} -> {1}]", key, isEnqueued() ? "ENQUEUED" : get());
+    return MessageFormat.format("KeyedPhantomReference[{0} -> {1}]", key, isEnqueued() ? "ENQUEUED" : get()); //$NON-NLS-1$ //$NON-NLS-2$
   }
 }
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/KeyedSoftReference.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/KeyedSoftReference.java
index b0b2eacaaa..504ae6476f 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/KeyedSoftReference.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/KeyedSoftReference.java
@@ -46,6 +46,6 @@ public class KeyedSoftReference<K, T> extends SoftReference<T> implements KeyedR
   @Override
   public String toString()
   {
-    return MessageFormat.format("KeyedSoftReference[{0} -> {1}]", key, isEnqueued() ? "ENQUEUED" : get());
+    return MessageFormat.format("KeyedSoftReference[{0} -> {1}]", key, isEnqueued() ? "ENQUEUED" : get()); //$NON-NLS-1$ //$NON-NLS-2$
   }
 }
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/KeyedStrongReference.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/KeyedStrongReference.java
index 8ea64a94b1..5530d88803 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/KeyedStrongReference.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/KeyedStrongReference.java
@@ -60,6 +60,6 @@ public class KeyedStrongReference<K, T> implements KeyedReference<K, T>
   @Override
   public String toString()
   {
-    return MessageFormat.format("KeyedStrongReference[{0} -> {1}]", key, ref);
+    return MessageFormat.format("KeyedStrongReference[{0} -> {1}]", key, ref); //$NON-NLS-1$
   }
 }
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/KeyedWeakReference.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/KeyedWeakReference.java
index 59b63a8cd7..a1409ec5e6 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/KeyedWeakReference.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/KeyedWeakReference.java
@@ -46,6 +46,6 @@ public class KeyedWeakReference<K, T> extends WeakReference<T> implements KeyedR
   @Override
   public String toString()
   {
-    return MessageFormat.format("KeyedWeakReference[{0} -> {1}]", key, isEnqueued() ? "ENQUEUED" : get());
+    return MessageFormat.format("KeyedWeakReference[{0} -> {1}]", key, isEnqueued() ? "ENQUEUED" : get()); //$NON-NLS-1$ //$NON-NLS-2$
   }
 }
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/ReferenceValueMap.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/ReferenceValueMap.java
index 94afae2b81..b1639706d3 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/ReferenceValueMap.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/ReferenceValueMap.java
@@ -51,7 +51,7 @@ public abstract class ReferenceValueMap<K, V> extends AbstractMap<K, V> implemen
   {
     if (!map.isEmpty())
     {
-      throw new IllegalArgumentException("!map.isEmpty()");
+      throw new IllegalArgumentException("!map.isEmpty()"); //$NON-NLS-1$
     }
 
     this.map = map;
@@ -95,7 +95,7 @@ public abstract class ReferenceValueMap<K, V> extends AbstractMap<K, V> implemen
   {
     if (value == null)
     {
-      throw new IllegalArgumentException("value == null");
+      throw new IllegalArgumentException("value == null"); //$NON-NLS-1$
     }
 
     for (KeyedReference<K, V> ref : map.values())
@@ -345,7 +345,7 @@ public abstract class ReferenceValueMap<K, V> extends AbstractMap<K, V> implemen
     {
       if (object == null)
       {
-        throw new IllegalArgumentException("object == null");
+        throw new IllegalArgumentException("object == null"); //$NON-NLS-1$
       }
 
       if (object instanceof Map.Entry<?, ?>)
@@ -384,7 +384,7 @@ public abstract class ReferenceValueMap<K, V> extends AbstractMap<K, V> implemen
     {
       if (a == null)
       {
-        throw new IllegalArgumentException("array == null");
+        throw new IllegalArgumentException("array == null"); //$NON-NLS-1$
       }
 
       int size = size();
@@ -412,7 +412,7 @@ public abstract class ReferenceValueMap<K, V> extends AbstractMap<K, V> implemen
     {
       if (object == null)
       {
-        throw new IllegalArgumentException("object == null");
+        throw new IllegalArgumentException("object == null"); //$NON-NLS-1$
       }
 
       if (object instanceof Map.Entry<?, ?>)
@@ -492,7 +492,7 @@ public abstract class ReferenceValueMap<K, V> extends AbstractMap<K, V> implemen
     {
       if (lastKey == null)
       {
-        throw new IllegalStateException("lastKey == null");
+        throw new IllegalStateException("lastKey == null"); //$NON-NLS-1$
       }
 
       map.remove(lastKey);
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/registry/Registry.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/registry/Registry.java
index 9393f98441..1ede69f41b 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/registry/Registry.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/registry/Registry.java
@@ -156,7 +156,7 @@ public abstract class Registry<K, V> extends Container<Map.Entry<K, V>> implemen
     {
       if (!transaction.isOwned())
       {
-        OM.LOG.warn("Committing thread is not owner of transaction: " + Thread.currentThread());
+        OM.LOG.warn("Committing thread is not owner of transaction: " + Thread.currentThread()); //$NON-NLS-1$
       }
 
       transaction.commit(notifications);
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/ChallengeNegotiator.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/ChallengeNegotiator.java
index 5f819291a4..7951fa3760 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/ChallengeNegotiator.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/ChallengeNegotiator.java
@@ -69,17 +69,17 @@ public class ChallengeNegotiator extends ChallengeResponseNegotiator
     super.doBeforeActivate();
     if (tokenLength <= 0)
     {
-      throw new IllegalStateException("tokenLength must be positive");
+      throw new IllegalStateException("tokenLength must be positive"); //$NON-NLS-1$
     }
 
     if (randomizer == null)
     {
-      throw new IllegalStateException("randomizer == null");
+      throw new IllegalStateException("randomizer == null"); //$NON-NLS-1$
     }
 
     if (userManager == null)
     {
-      throw new IllegalStateException("userManager == null");
+      throw new IllegalStateException("userManager == null"); //$NON-NLS-1$
     }
   }
 
@@ -99,7 +99,7 @@ public class ChallengeNegotiator extends ChallengeResponseNegotiator
     }
     catch (Exception ex)
     {
-      OM.LOG.error("Token encryption failed", ex);
+      OM.LOG.error("Token encryption failed", ex); //$NON-NLS-1$
       return null;
     }
   }
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/ChallengeNegotiatorFactory.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/ChallengeNegotiatorFactory.java
index 761b39d327..e42904a04f 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/ChallengeNegotiatorFactory.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/ChallengeNegotiatorFactory.java
@@ -15,7 +15,7 @@ package org.eclipse.net4j.util.security;
  */
 public class ChallengeNegotiatorFactory extends NegotiatorFactory
 {
-  public static final String TYPE = "challenge";
+  public static final String TYPE = "challenge"; //$NON-NLS-1$
 
   public ChallengeNegotiatorFactory()
   {
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/ChallengeResponseNegotiator.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/ChallengeResponseNegotiator.java
index 0665b3308a..f93727361b 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/ChallengeResponseNegotiator.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/ChallengeResponseNegotiator.java
@@ -155,10 +155,10 @@ public abstract class ChallengeResponseNegotiator extends
   protected void doBeforeActivate() throws Exception
   {
     super.doBeforeActivate();
-    checkState(encryptionAlgorithmName, "encryptionAlgorithmName");
-    checkState(encryptionSaltBytes, "encryptionSaltBytes");
-    checkState(encryptionSaltBytes.length > 0, "encryptionSaltBytes");
-    checkState(encryptionIterationCount > 0, "encryptionIterationCount");
+    checkState(encryptionAlgorithmName, "encryptionAlgorithmName"); //$NON-NLS-1$
+    checkState(encryptionSaltBytes, "encryptionSaltBytes"); //$NON-NLS-1$
+    checkState(encryptionSaltBytes.length > 0, "encryptionSaltBytes"); //$NON-NLS-1$
+    checkState(encryptionIterationCount > 0, "encryptionIterationCount"); //$NON-NLS-1$
   }
 
   @Override
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/FileUserManager.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/FileUserManager.java
index 54995fda64..babed141b9 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/FileUserManager.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/FileUserManager.java
@@ -50,13 +50,13 @@ public class FileUserManager extends UserManager
     super.doBeforeActivate();
     if (fileName == null)
     {
-      throw new IllegalStateException("fileName == null");
+      throw new IllegalStateException("fileName == null"); //$NON-NLS-1$
     }
 
     File file = new File(fileName);
     if (file.exists() && !file.isFile())
     {
-      throw new IllegalStateException("Not a file: " + fileName);
+      throw new IllegalStateException("Not a file: " + fileName); //$NON-NLS-1$
     }
   }
 
@@ -128,7 +128,7 @@ public class FileUserManager extends UserManager
       properties.put(entry.getKey(), new String(entry.getValue()));
     }
 
-    String comment = MessageFormat.format("User database {0,date} {0,time}", System.currentTimeMillis());
+    String comment = MessageFormat.format("User database {0,date} {0,time}", System.currentTimeMillis()); //$NON-NLS-1$
     properties.store(stream, comment);
   }
 }
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/FileUserManagerFactory.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/FileUserManagerFactory.java
index 6c27b2f54c..2f350f2c5a 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/FileUserManagerFactory.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/FileUserManagerFactory.java
@@ -17,7 +17,7 @@ package org.eclipse.net4j.util.security;
  */
 public class FileUserManagerFactory extends UserManagerFactory
 {
-  public static final String TYPE = "file";
+  public static final String TYPE = "file"; //$NON-NLS-1$
 
   public FileUserManagerFactory()
   {
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/NegotiationContext.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/NegotiationContext.java
index 424e19ec7e..780f264128 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/NegotiationContext.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/NegotiationContext.java
@@ -74,7 +74,7 @@ public abstract class NegotiationContext implements INegotiationContext
   {
     if (finishedLatch == null)
     {
-      throw new IllegalStateException("finishedLatch == null");
+      throw new IllegalStateException("finishedLatch == null"); //$NON-NLS-1$
     }
 
     try
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/Negotiator.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/Negotiator.java
index a4171b18f4..d2335a06ad 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/Negotiator.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/Negotiator.java
@@ -38,27 +38,27 @@ public abstract class Negotiator<STATE extends Enum<?>, EVENT extends Enum<?>> e
     super(stateEnum, eventEnum);
     if (initialState == null)
     {
-      throw new IllegalStateException("initialState == null");
+      throw new IllegalStateException("initialState == null"); //$NON-NLS-1$
     }
 
     if (successState == null)
     {
-      throw new IllegalStateException("successState == null");
+      throw new IllegalStateException("successState == null"); //$NON-NLS-1$
     }
 
     if (failureState == null)
     {
-      throw new IllegalStateException("failureState == null");
+      throw new IllegalStateException("failureState == null"); //$NON-NLS-1$
     }
 
     if (startEvent == null)
     {
-      throw new IllegalStateException("startEvent == null");
+      throw new IllegalStateException("startEvent == null"); //$NON-NLS-1$
     }
 
     if (bufferEvent == null)
     {
-      throw new IllegalStateException("bufferEvent == null");
+      throw new IllegalStateException("bufferEvent == null"); //$NON-NLS-1$
     }
 
     this.initialState = initialState;
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/NegotiatorFactory.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/NegotiatorFactory.java
index 143cec9c8b..1061c3dece 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/NegotiatorFactory.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/NegotiatorFactory.java
@@ -17,7 +17,7 @@ import org.eclipse.net4j.util.factory.Factory;
  */
 public abstract class NegotiatorFactory extends Factory
 {
-  public static final String PRODUCT_GROUP = "org.eclipse.net4j.Negotiators";
+  public static final String PRODUCT_GROUP = "org.eclipse.net4j.Negotiators"; //$NON-NLS-1$
 
   public NegotiatorFactory(String type)
   {
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/Randomizer.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/Randomizer.java
index 867b073cf7..a40612072b 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/Randomizer.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/Randomizer.java
@@ -20,7 +20,7 @@ import java.security.SecureRandom;
  */
 public class Randomizer extends Lifecycle implements IRandomizer
 {
-  public static final String ALGORITHM_SHA1PRNG = "SHA1PRNG";
+  public static final String ALGORITHM_SHA1PRNG = "SHA1PRNG"; //$NON-NLS-1$
 
   public static final String DEFAULT_ALGORITHM_NAME = ALGORITHM_SHA1PRNG;
 
@@ -151,7 +151,7 @@ public class Randomizer extends Lifecycle implements IRandomizer
   protected void doBeforeActivate() throws Exception
   {
     super.doBeforeActivate();
-    checkState(algorithmName, "algorithmName");
+    checkState(algorithmName, "algorithmName"); //$NON-NLS-1$
     if (seed == null)
     {
       setSeed(System.currentTimeMillis());
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/RandomizerFactory.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/RandomizerFactory.java
index 991c71f213..6f3ea5fdbc 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/RandomizerFactory.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/RandomizerFactory.java
@@ -18,9 +18,9 @@ import org.eclipse.net4j.util.factory.ProductCreationException;
  */
 public class RandomizerFactory extends Factory
 {
-  public static final String PRODUCT_GROUP = "org.eclipse.net4j.randomizers";
+  public static final String PRODUCT_GROUP = "org.eclipse.net4j.randomizers"; //$NON-NLS-1$
 
-  public static final String TYPE = "default";
+  public static final String TYPE = "default"; //$NON-NLS-1$
 
   public RandomizerFactory()
   {
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/ResponseNegotiator.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/ResponseNegotiator.java
index 485bb76bf4..16b6ff3c5e 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/ResponseNegotiator.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/ResponseNegotiator.java
@@ -40,7 +40,7 @@ public class ResponseNegotiator extends ChallengeResponseNegotiator
     super.doBeforeActivate();
     if (credentialsProvider == null)
     {
-      throw new IllegalStateException("credentialsProvider == null");
+      throw new IllegalStateException("credentialsProvider == null"); //$NON-NLS-1$
     }
   }
 
@@ -82,7 +82,7 @@ public class ResponseNegotiator extends ChallengeResponseNegotiator
   {
     if (!success)
     {
-      throw new NegotiationException("Negotiation failed");
+      throw new NegotiationException("Negotiation failed"); //$NON-NLS-1$
     }
   }
 
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/ResponseNegotiatorFactory.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/ResponseNegotiatorFactory.java
index e4182bf72f..ae3068820d 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/ResponseNegotiatorFactory.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/ResponseNegotiatorFactory.java
@@ -15,7 +15,7 @@ package org.eclipse.net4j.util.security;
  */
 public class ResponseNegotiatorFactory extends NegotiatorFactory
 {
-  public static final String TYPE = "response";
+  public static final String TYPE = "response"; //$NON-NLS-1$
 
   public ResponseNegotiatorFactory()
   {
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/SecurityUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/SecurityUtil.java
index d17c07f1b6..2d832d480a 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/SecurityUtil.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/SecurityUtil.java
@@ -29,7 +29,7 @@ import java.security.spec.InvalidKeySpecException;
  */
 public final class SecurityUtil
 {
-  public static final String PBE_WITH_MD5_AND_DES = "PBEWithMD5AndDES";
+  public static final String PBE_WITH_MD5_AND_DES = "PBEWithMD5AndDES"; //$NON-NLS-1$
 
   private SecurityUtil()
   {
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/UserManager.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/UserManager.java
index cda8eb9dc6..6bc0f75aff 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/UserManager.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/UserManager.java
@@ -56,7 +56,7 @@ public class UserManager extends Lifecycle implements IUserManager
 
     if (password == null)
     {
-      throw new SecurityException("No such user: " + userID);
+      throw new SecurityException("No such user: " + userID); //$NON-NLS-1$
     }
 
     try
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/UserManagerFactory.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/UserManagerFactory.java
index d075e50578..493db9a615 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/UserManagerFactory.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/UserManagerFactory.java
@@ -17,7 +17,7 @@ import org.eclipse.net4j.util.factory.Factory;
  */
 public abstract class UserManagerFactory extends Factory
 {
-  public static final String PRODUCT_GROUP = "org.eclipse.net4j.userManagers";
+  public static final String PRODUCT_GROUP = "org.eclipse.net4j.userManagers"; //$NON-NLS-1$
 
   public UserManagerFactory(String type)
   {
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/transaction/Transaction.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/transaction/Transaction.java
index 3f375dfc4c..0d90397e7c 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/transaction/Transaction.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/transaction/Transaction.java
@@ -54,7 +54,7 @@ public class Transaction<CONTEXT> implements ITransaction<CONTEXT>
   {
     if (!isActive())
     {
-      throw new TransactionException("Transaction inactive");
+      throw new TransactionException("Transaction inactive"); //$NON-NLS-1$
     }
 
     try
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/DescriptionUtil.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/DescriptionUtil.java
index 04e73f14f0..400f1da818 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/DescriptionUtil.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/DescriptionUtil.java
@@ -47,7 +47,7 @@ public final class DescriptionUtil
 
     for (Object element : elements)
     {
-      builder.append(":");
+      builder.append(":"); //$NON-NLS-1$
       if (element != null)
       {
         builder.append(element);
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/ExecutorServiceFactory.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/ExecutorServiceFactory.java
index 52206c6e6e..30e6dda59e 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/ExecutorServiceFactory.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/ExecutorServiceFactory.java
@@ -25,11 +25,11 @@ import java.util.concurrent.ThreadFactory;
  */
 public class ExecutorServiceFactory extends Factory
 {
-  public static final String PRODUCT_GROUP = "org.eclipse.net4j.executorServices";
+  public static final String PRODUCT_GROUP = "org.eclipse.net4j.executorServices"; //$NON-NLS-1$
 
-  public static final String TYPE = "default";
+  public static final String TYPE = "default"; //$NON-NLS-1$
 
-  public static final String DEFAULT_THREAD_GROUP_NAME = "net4j";
+  public static final String DEFAULT_THREAD_GROUP_NAME = "net4j"; //$NON-NLS-1$
 
   public ExecutorServiceFactory()
   {
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/TransportConfig.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/TransportConfig.java
index 1aa47841d6..eb96518923 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/TransportConfig.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/TransportConfig.java
@@ -118,7 +118,7 @@ public class TransportConfig implements ITransportConfig
   public String toString()
   {
     return MessageFormat.format(
-        "TransportConfig[receiveExecutor={0}, bufferProvider={1}, protocolProvider={2}, negotiator={3}]",
+        "TransportConfig[receiveExecutor={0}, bufferProvider={1}, protocolProvider={2}, negotiator={3}]", //$NON-NLS-1$
         receiveExecutor, bufferProvider, protocolProvider, negotiator);
   }
 }
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/buffer/BufferPool.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/buffer/BufferPool.java
index 218cef987c..3b27fede7a 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/buffer/BufferPool.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/buffer/BufferPool.java
@@ -197,7 +197,7 @@ public class BufferPool extends BufferProvider implements IBufferPool, IBufferPo
   {
     public Monitor()
     {
-      setName("BufferPoolMonitor");
+      setName("BufferPoolMonitor"); //$NON-NLS-1$
       setDaemon(true);
     }
 
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/buffer/BufferProviderFactory.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/buffer/BufferProviderFactory.java
index 730f740fba..7896cceb6a 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/buffer/BufferProviderFactory.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/buffer/BufferProviderFactory.java
@@ -20,9 +20,9 @@ import org.eclipse.net4j.util.factory.Factory;
  */
 public class BufferProviderFactory extends Factory
 {
-  public static final String PRODUCT_GROUP = "org.eclipse.net4j.bufferProviders";
+  public static final String PRODUCT_GROUP = "org.eclipse.net4j.bufferProviders"; //$NON-NLS-1$
 
-  public static final String TYPE = "default";
+  public static final String TYPE = "default"; //$NON-NLS-1$
 
   public static final short BUFFER_CAPACITY = 4096;
 
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/ContainerProtocolProvider.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/ContainerProtocolProvider.java
index 87f1eb21a6..76c4ca9147 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/ContainerProtocolProvider.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/ContainerProtocolProvider.java
@@ -48,7 +48,7 @@ public abstract class ContainerProtocolProvider implements IProtocolProvider
 
   public IProtocol<?> getProtocol(String type)
   {
-    return (IProtocol<?>)container.getElement(productGroup, type, "protocol-" + counter.increment(), false);
+    return (IProtocol<?>)container.getElement(productGroup, type, "protocol-" + counter.increment(), false); //$NON-NLS-1$
   }
 
   /**
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/Net4jUtil.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/Net4jUtil.java
index 38c012544f..ecc2670964 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/Net4jUtil.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/Net4jUtil.java
@@ -35,7 +35,7 @@ import java.util.concurrent.ExecutorService;
  */
 public final class Net4jUtil
 {
-  public static final String SCHEME_SEPARATOR = "://";
+  public static final String SCHEME_SEPARATOR = "://"; //$NON-NLS-1$
 
   public static final short DEFAULT_BUFFER_CAPACITY = 4096;
 
@@ -76,7 +76,7 @@ public final class Net4jUtil
     int pos = description.indexOf(SCHEME_SEPARATOR);
     if (pos <= 0)
     {
-      throw new IllegalArgumentException("Connector type (scheme) missing: " + description);
+      throw new IllegalArgumentException("Connector type (scheme) missing: " + description); //$NON-NLS-1$
     }
 
     String factoryType = description.substring(0, pos);
@@ -84,7 +84,7 @@ public final class Net4jUtil
     String connectorDescription = description.substring(pos + SCHEME_SEPARATOR.length());
     if (StringUtil.isEmpty(connectorDescription))
     {
-      throw new IllegalArgumentException("Illegal connector description: " + description);
+      throw new IllegalArgumentException("Illegal connector description: " + description); //$NON-NLS-1$
     }
 
     return (IConnector)container.getElement(ConnectorFactory.PRODUCT_GROUP, factoryType, connectorDescription);
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/TransportConfigurator.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/TransportConfigurator.java
index a5774b8dfa..6142358eda 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/TransportConfigurator.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/TransportConfigurator.java
@@ -64,12 +64,12 @@ public class TransportConfigurator
   {
     if (TRACER.isEnabled())
     {
-      TRACER.trace("Configuring Net4j server from " + configFile.getAbsolutePath());
+      TRACER.trace("Configuring Net4j server from " + configFile.getAbsolutePath()); //$NON-NLS-1$
     }
 
     List<IAcceptor> acceptors = new ArrayList<IAcceptor>();
     Document document = getDocument(configFile);
-    NodeList acceptorConfigs = document.getElementsByTagName("acceptor");
+    NodeList acceptorConfigs = document.getElementsByTagName("acceptor"); //$NON-NLS-1$
     for (int i = 0; i < acceptorConfigs.getLength(); i++)
     {
       Element acceptorConfig = (Element)acceptorConfigs.item(i);
@@ -82,17 +82,17 @@ public class TransportConfigurator
 
   protected IAcceptor configureAcceptor(Element acceptorConfig)
   {
-    String type = acceptorConfig.getAttribute("type");
+    String type = acceptorConfig.getAttribute("type"); //$NON-NLS-1$
     // TODO Make the following dependent on the "type" attribute value
-    String listenAddr = acceptorConfig.getAttribute("listenAddr");
-    String port = acceptorConfig.getAttribute("port");
-    String description = (listenAddr == null ? "" : listenAddr) + (port == null ? "" : ":" + port);
+    String listenAddr = acceptorConfig.getAttribute("listenAddr"); //$NON-NLS-1$
+    String port = acceptorConfig.getAttribute("port"); //$NON-NLS-1$
+    String description = (listenAddr == null ? "" : listenAddr) + (port == null ? "" : ":" + port); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     Acceptor acceptor = (Acceptor)container.getElement(AcceptorFactory.PRODUCT_GROUP, type, description, false);
 
-    NodeList negotiatorConfigs = acceptorConfig.getElementsByTagName("negotiator");
+    NodeList negotiatorConfigs = acceptorConfig.getElementsByTagName("negotiator"); //$NON-NLS-1$
     if (negotiatorConfigs.getLength() > 1)
     {
-      throw new IllegalStateException("A maximum of one negotiator can be configured for acceptor " + acceptor);
+      throw new IllegalStateException("A maximum of one negotiator can be configured for acceptor " + acceptor); //$NON-NLS-1$
     }
 
     if (negotiatorConfigs.getLength() == 1)
@@ -108,8 +108,8 @@ public class TransportConfigurator
 
   protected INegotiator configureNegotiator(Element negotiatorConfig)
   {
-    String type = negotiatorConfig.getAttribute("type");
-    String description = negotiatorConfig.getAttribute("description");
+    String type = negotiatorConfig.getAttribute("type"); //$NON-NLS-1$
+    String description = negotiatorConfig.getAttribute("description"); //$NON-NLS-1$
     return (INegotiator)container.getElement(NegotiatorFactory.PRODUCT_GROUP, type, description);
   }
 
@@ -122,11 +122,11 @@ public class TransportConfigurator
 
   protected Element getStoreConfig(Element repositoryConfig)
   {
-    NodeList storeConfigs = repositoryConfig.getElementsByTagName("store");
+    NodeList storeConfigs = repositoryConfig.getElementsByTagName("store"); //$NON-NLS-1$
     if (storeConfigs.getLength() != 1)
     {
-      String repositoryName = repositoryConfig.getAttribute("name");
-      throw new IllegalStateException("Exactly one store must be configured for repository " + repositoryName);
+      String repositoryName = repositoryConfig.getAttribute("name"); //$NON-NLS-1$
+      throw new IllegalStateException("Exactly one store must be configured for repository " + repositoryName); //$NON-NLS-1$
     }
 
     return (Element)storeConfigs.item(0);
@@ -135,18 +135,18 @@ public class TransportConfigurator
   public static Map<String, String> getProperties(Element element, int levels)
   {
     Map<String, String> properties = new HashMap<String, String>();
-    collectProperties(element, "", properties, levels);
+    collectProperties(element, "", properties, levels); //$NON-NLS-1$
     return properties;
   }
 
   private static void collectProperties(Element element, String prefix, Map<String, String> properties, int levels)
   {
-    if ("property".equals(element.getNodeName()))
+    if ("property".equals(element.getNodeName())) //$NON-NLS-1$
     {
-      String name = element.getAttribute("name");
-      String value = element.getAttribute("value");
+      String name = element.getAttribute("name"); //$NON-NLS-1$
+      String value = element.getAttribute("value"); //$NON-NLS-1$
       properties.put(prefix + name, value);
-      prefix += name + ".";
+      prefix += name + "."; //$NON-NLS-1$
     }
 
     if (levels > 0)
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/MonitorCanceledIndication.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/MonitorCanceledIndication.java
index f11278a3a2..8a671cf531 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/MonitorCanceledIndication.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/MonitorCanceledIndication.java
@@ -33,7 +33,7 @@ class MonitorCanceledIndication extends Indication
     int correlationID = in.readInt();
     if (TRACER.isEnabled())
     {
-      TRACER.format("Canceling monitor of signal {0}", correlationID);
+      TRACER.format("Canceling monitor of signal {0}", correlationID); //$NON-NLS-1$
     }
 
     getProtocol().handleMonitorCanceled(correlationID);
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/MonitorCanceledRequest.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/MonitorCanceledRequest.java
index de2e7c1775..6602dcfae2 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/MonitorCanceledRequest.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/MonitorCanceledRequest.java
@@ -35,7 +35,7 @@ class MonitorCanceledRequest extends Request
   {
     if (TRACER.isEnabled())
     {
-      TRACER.format("Canceling monitor of signal {0}", correlationID);
+      TRACER.format("Canceling monitor of signal {0}", correlationID); //$NON-NLS-1$
     }
 
     out.writeInt(correlationID);
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/MonitorProgressIndication.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/MonitorProgressIndication.java
index 35ddcee89e..6b054833e6 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/MonitorProgressIndication.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/MonitorProgressIndication.java
@@ -35,7 +35,7 @@ class MonitorProgressIndication extends Indication
     double work = in.readDouble();
     if (TRACER.isEnabled())
     {
-      TRACER.format("Progress of signal {0}: totalWork={1}, work={2}", correlationID, totalWork, work);
+      TRACER.format("Progress of signal {0}: totalWork={1}, work={2}", correlationID, totalWork, work); //$NON-NLS-1$
     }
 
     getProtocol().handleMonitorProgress(correlationID, totalWork, work);
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/MonitorProgressRequest.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/MonitorProgressRequest.java
index f17563b068..4c4f0f1105 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/MonitorProgressRequest.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/MonitorProgressRequest.java
@@ -41,7 +41,7 @@ class MonitorProgressRequest extends Request
   {
     if (TRACER.isEnabled())
     {
-      TRACER.format("Progress of signal {0}: totalWork={1}, work={2}", correlationID, totalWork, work);
+      TRACER.format("Progress of signal {0}: totalWork={1}, work={2}", correlationID, totalWork, work); //$NON-NLS-1$
     }
 
     out.writeInt(correlationID);
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/RemoteExceptionIndication.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/RemoteExceptionIndication.java
index 2956cdf9e9..6ccfaebbb0 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/RemoteExceptionIndication.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/RemoteExceptionIndication.java
@@ -38,7 +38,7 @@ class RemoteExceptionIndication extends Indication
     if (TRACER.isEnabled())
     {
       String msg = RemoteExceptionRequest.getFirstLine(message);
-      TRACER.format("Reading remote exception for signal {0}: {1}", correlationID, msg);
+      TRACER.format("Reading remote exception for signal {0}: {1}", correlationID, msg); //$NON-NLS-1$
     }
 
     try
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/RemoteExceptionRequest.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/RemoteExceptionRequest.java
index cd84df3c3b..c817675df6 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/RemoteExceptionRequest.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/RemoteExceptionRequest.java
@@ -46,7 +46,7 @@ class RemoteExceptionRequest extends Request
     if (TRACER.isEnabled())
     {
       String msg = getFirstLine(message);
-      TRACER.format("Writing remote exception for signal {0}: {1}", correlationID, msg);
+      TRACER.format("Writing remote exception for signal {0}: {1}", correlationID, msg); //$NON-NLS-1$
     }
 
     out.writeInt(correlationID);
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/RequestWithMonitoring.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/RequestWithMonitoring.java
index 68c6172b7a..7e0f879ef0 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/RequestWithMonitoring.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/RequestWithMonitoring.java
@@ -120,7 +120,7 @@ public abstract class RequestWithMonitoring<RESULT> extends RequestWithConfirmat
     double remoteWork = OMMonitor.HUNDRED - getRequestingWorkPercent() - getConfirmingWorkPercent();
     if (remoteWork < OMMonitor.ZERO)
     {
-      throw new ImplementationError("Remote work must not be negative: " + remoteWork);
+      throw new ImplementationError("Remote work must not be negative: " + remoteWork); //$NON-NLS-1$
     }
 
     mainMonitor.begin(OMMonitor.HUNDRED);
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Signal.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Signal.java
index 61e8fdd0c8..e7421a7594 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Signal.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Signal.java
@@ -127,7 +127,7 @@ public abstract class Signal implements Runnable
   @Override
   public String toString()
   {
-    return MessageFormat.format("Signal[protocol={0}, id={1}, name={2}, correlation={3}]", getProtocol().getType(),
+    return MessageFormat.format("Signal[protocol={0}, id={1}, name={2}, correlation={3}]", getProtocol().getType(), //$NON-NLS-1$
         getID(), getName(), getCorrelationID());
   }
 
@@ -152,7 +152,7 @@ public abstract class Signal implements Runnable
     {
       if (threadName != null)
       {
-        Thread.currentThread().setName(threadName + "(FINISHED)");
+        Thread.currentThread().setName(threadName + "(FINISHED)"); //$NON-NLS-1$
       }
     }
   }
@@ -243,7 +243,7 @@ public abstract class Signal implements Runnable
         TRACER.trace(ex);
       }
 
-      throw new TimeoutException("Timeout");
+      throw new TimeoutException("Timeout"); //$NON-NLS-1$
     }
     catch (Exception ex)
     {
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalActor.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalActor.java
index 0eef688e55..81059aca8b 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalActor.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalActor.java
@@ -87,12 +87,12 @@ public abstract class SignalActor extends Signal
   @Override
   String getInputMeaning()
   {
-    return "Confirming";
+    return "Confirming"; //$NON-NLS-1$
   }
 
   @Override
   String getOutputMeaning()
   {
-    return "Requesting";
+    return "Requesting"; //$NON-NLS-1$
   }
 }
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalProtocol.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalProtocol.java
index dd7fbd8c13..15c89e0220 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalProtocol.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalProtocol.java
@@ -161,7 +161,7 @@ public class SignalProtocol<INFRA_STRUCTURE> extends Protocol<INFRA_STRUCTURE> i
    */
   public IChannel open()
   {
-    checkState(failOverStrategy, "failOverStrategy");
+    checkState(failOverStrategy, "failOverStrategy"); //$NON-NLS-1$
     failOverStrategy.handleOpen(this);
     return getChannel();
   }
@@ -267,7 +267,7 @@ public class SignalProtocol<INFRA_STRUCTURE> extends Protocol<INFRA_STRUCTURE> i
       if (signal instanceof RequestWithConfirmation<?>)
       {
         RequestWithConfirmation<?> request = (RequestWithConfirmation<?>)signal;
-        request.setRemoteException(new IllegalStateException("Request canceled due to protocol deactivation"), false);
+        request.setRemoteException(new IllegalStateException("Request canceled due to protocol deactivation"), false); //$NON-NLS-1$
       }
     }
 
@@ -322,7 +322,7 @@ public class SignalProtocol<INFRA_STRUCTURE> extends Protocol<INFRA_STRUCTURE> i
       SignalReactor signal = createSignalReactor(signalID);
       if (signal == null)
       {
-        throw new IllegalArgumentException("Invalid signalID " + signalID);
+        throw new IllegalArgumentException("Invalid signalID " + signalID); //$NON-NLS-1$
       }
 
       return signal;
@@ -404,7 +404,7 @@ public class SignalProtocol<INFRA_STRUCTURE> extends Protocol<INFRA_STRUCTURE> i
 
   void startSignal(SignalActor signalActor, long timeout) throws Exception
   {
-    checkArg(signalActor.getProtocol() == this, "Wrong protocol");
+    checkArg(signalActor.getProtocol() == this, "Wrong protocol"); //$NON-NLS-1$
     short signalID = signalActor.getID();
     int correlationID = signalActor.getCorrelationID();
     signalActor.setBufferOutputStream(new SignalOutputStream(correlationID, signalID, true));
@@ -560,7 +560,7 @@ public class SignalProtocol<INFRA_STRUCTURE> extends Protocol<INFRA_STRUCTURE> i
           IChannel channel = getChannel();
           if (channel == null)
           {
-            throw new IORuntimeException("No channel for protocol " + SignalProtocol.this);
+            throw new IORuntimeException("No channel for protocol " + SignalProtocol.this); //$NON-NLS-1$
           }
 
           IBuffer buffer = delegate.provideBuffer();
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalReactor.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalReactor.java
index 358988a569..15461e88eb 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalReactor.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalReactor.java
@@ -42,12 +42,12 @@ public abstract class SignalReactor extends Signal
   @Override
   String getInputMeaning()
   {
-    return "Indicating";
+    return "Indicating"; //$NON-NLS-1$
   }
 
   @Override
   String getOutputMeaning()
   {
-    return "Responding";
+    return "Responding"; //$NON-NLS-1$
   }
 }
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/failover/NOOPFailOverStrategy.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/failover/NOOPFailOverStrategy.java
index 625e9704d7..1db5e60d1f 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/failover/NOOPFailOverStrategy.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/failover/NOOPFailOverStrategy.java
@@ -67,6 +67,6 @@ public class NOOPFailOverStrategy extends Notifier implements IFailOverStrategy
   @Override
   public String toString()
   {
-    return "NOOP";
+    return "NOOP"; //$NON-NLS-1$
   }
 }
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/spi/net4j/AcceptorFactory.java b/plugins/org.eclipse.net4j/src/org/eclipse/spi/net4j/AcceptorFactory.java
index a961a018ea..ba32fca881 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/spi/net4j/AcceptorFactory.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/spi/net4j/AcceptorFactory.java
@@ -17,7 +17,7 @@ import org.eclipse.net4j.util.factory.Factory;
  */
 public abstract class AcceptorFactory extends Factory
 {
-  public static final String PRODUCT_GROUP = "org.eclipse.net4j.acceptors";
+  public static final String PRODUCT_GROUP = "org.eclipse.net4j.acceptors"; //$NON-NLS-1$
 
   public AcceptorFactory(String type)
   {
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/spi/net4j/Channel.java b/plugins/org.eclipse.net4j/src/org/eclipse/spi/net4j/Channel.java
index d9130f02f6..ea5e56fb31 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/spi/net4j/Channel.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/spi/net4j/Channel.java
@@ -236,7 +236,7 @@ public class Channel extends Lifecycle implements InternalChannel
         @Override
         protected String getThreadName()
         {
-          return "ReceiveSerializer-" + Channel.this;
+          return "ReceiveSerializer-" + Channel.this; //$NON-NLS-1$
         }
       }
 
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/spi/net4j/ChannelMultiplexer.java b/plugins/org.eclipse.net4j/src/org/eclipse/spi/net4j/ChannelMultiplexer.java
index 8879ecde16..efe87d5bb6 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/spi/net4j/ChannelMultiplexer.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/spi/net4j/ChannelMultiplexer.java
@@ -84,7 +84,7 @@ public abstract class ChannelMultiplexer extends Container<IChannel> implements
   {
     if (openChannelTimeout == IChannelMultiplexer.DEFAULT_OPEN_CHANNEL_TIMEOUT)
     {
-      return OM.BUNDLE.getDebugSupport().getDebugOption("open.channel.timeout", 10000);
+      return OM.BUNDLE.getDebugSupport().getDebugOption("open.channel.timeout", 10000); //$NON-NLS-1$
     }
 
     return openChannelTimeout;
@@ -127,7 +127,7 @@ public abstract class ChannelMultiplexer extends Container<IChannel> implements
     IProtocol<?> protocol = createProtocol(protocolID, infraStructure);
     if (protocol == null)
     {
-      throw new IllegalArgumentException("Unknown protocolID: " + protocolID);
+      throw new IllegalArgumentException("Unknown protocolID: " + protocolID); //$NON-NLS-1$
     }
 
     return openChannel(protocol);
@@ -158,7 +158,7 @@ public abstract class ChannelMultiplexer extends Container<IChannel> implements
       catch (TimeoutRuntimeException ex)
       {
         // Adjust the message for the complete timeout time
-        String message = "Registration timeout  after " + getOpenChannelTimeout() + " milliseconds";
+        String message = "Registration timeout  after " + getOpenChannelTimeout() + " milliseconds"; //$NON-NLS-1$ //$NON-NLS-2$
         throw new TimeoutRuntimeException(message, ex);
       }
     }
@@ -214,7 +214,7 @@ public abstract class ChannelMultiplexer extends Container<IChannel> implements
       if (TRACER.isEnabled())
       {
         String protocolType = protocol == null ? null : protocol.getType();
-        TRACER.format("Opening channel with protocol {0}", protocolType);
+        TRACER.format("Opening channel with protocol {0}", protocolType); //$NON-NLS-1$
       }
 
       channel.setReceiveHandler(protocol);
@@ -223,7 +223,7 @@ public abstract class ChannelMultiplexer extends Container<IChannel> implements
     {
       if (TRACER.isEnabled())
       {
-        TRACER.trace("Opening channel without protocol");
+        TRACER.trace("Opening channel without protocol"); //$NON-NLS-1$
       }
     }
   }
@@ -239,13 +239,13 @@ public abstract class ChannelMultiplexer extends Container<IChannel> implements
     IProtocolProvider protocolProvider = getConfig().getProtocolProvider();
     if (protocolProvider == null)
     {
-      throw new ChannelException("No protocol provider configured");
+      throw new ChannelException("No protocol provider configured"); //$NON-NLS-1$
     }
 
     IProtocol<INFRA_STRUCTURE> protocol = (IProtocol<INFRA_STRUCTURE>)protocolProvider.getProtocol(type);
     if (protocol == null)
     {
-      throw new ChannelException("Invalid protocol factory: " + type);
+      throw new ChannelException("Invalid protocol factory: " + type); //$NON-NLS-1$
     }
 
     if (infraStructure != null)
@@ -314,7 +314,7 @@ public abstract class ChannelMultiplexer extends Container<IChannel> implements
         ++lastChannelID;
         if (lastChannelID == start)
         {
-          throw new ChannelException("Too many channels");
+          throw new ChannelException("Too many channels"); //$NON-NLS-1$
         }
 
         if (lastChannelID > maxValue)
@@ -336,7 +336,7 @@ public abstract class ChannelMultiplexer extends Container<IChannel> implements
     short channelID = channel.getID();
     if (channelID == IBuffer.CONTROL_CHANNEL || channelID == IBuffer.NO_CHANNEL)
     {
-      throw new ChannelException("Invalid channel ID: " + channelID);
+      throw new ChannelException("Invalid channel ID: " + channelID); //$NON-NLS-1$
     }
 
     channels.put(channelID, channel);
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/spi/net4j/ClientProtocolFactory.java b/plugins/org.eclipse.net4j/src/org/eclipse/spi/net4j/ClientProtocolFactory.java
index 7aaa7ee47b..e683c6f553 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/spi/net4j/ClientProtocolFactory.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/spi/net4j/ClientProtocolFactory.java
@@ -18,7 +18,7 @@ import org.eclipse.net4j.util.factory.Factory;
  */
 public abstract class ClientProtocolFactory extends Factory
 {
-  public static final String PRODUCT_GROUP = "org.eclipse.net4j.clientProtocols";
+  public static final String PRODUCT_GROUP = "org.eclipse.net4j.clientProtocols"; //$NON-NLS-1$
 
   public ClientProtocolFactory(String type)
   {
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/spi/net4j/Connector.java b/plugins/org.eclipse.net4j/src/org/eclipse/spi/net4j/Connector.java
index 6c623f0efb..c2574fc705 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/spi/net4j/Connector.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/spi/net4j/Connector.java
@@ -92,10 +92,10 @@ public abstract class Connector extends ChannelMultiplexer implements InternalCo
 
   public void setUserID(String userID)
   {
-    checkState(getState() != ConnectorState.CONNECTED, "Connector is already connected");
+    checkState(getState() != ConnectorState.CONNECTED, "Connector is already connected"); //$NON-NLS-1$
     if (TRACER.isEnabled())
     {
-      TRACER.format("Setting userID {0} for {1}", userID, this);
+      TRACER.format("Setting userID {0} for {1}", userID, this); //$NON-NLS-1$
     }
 
     this.userID = userID;
@@ -113,7 +113,7 @@ public abstract class Connector extends ChannelMultiplexer implements InternalCo
     {
       if (TRACER.isEnabled())
       {
-        TRACER.format("Setting state {0} (was {1}) for {2}", newState, oldState.toString().toLowerCase(), this);
+        TRACER.format("Setting state {0} (was {1}) for {2}", newState, oldState.toString().toLowerCase(), this); //$NON-NLS-1$
       }
 
       connectorState = newState;
@@ -177,7 +177,7 @@ public abstract class Connector extends ChannelMultiplexer implements InternalCo
   {
     if (negotiationException != null)
     {
-      throw new ConnectorException("Connector negotiation failed", negotiationException);
+      throw new ConnectorException("Connector negotiation failed", negotiationException); //$NON-NLS-1$
     }
 
     return connectorState == ConnectorState.CONNECTED;
@@ -208,7 +208,7 @@ public abstract class Connector extends ChannelMultiplexer implements InternalCo
     {
       if (TRACER.isEnabled())
       {
-        TRACER.trace("Waiting for connection...");
+        TRACER.trace("Waiting for connection..."); //$NON-NLS-1$
       }
 
       for (;;)
@@ -357,11 +357,11 @@ public abstract class Connector extends ChannelMultiplexer implements InternalCo
   protected void doBeforeActivate() throws Exception
   {
     super.doBeforeActivate();
-    checkState(getConfig().getBufferProvider(), "getConfig().getBufferProvider()");
+    checkState(getConfig().getBufferProvider(), "getConfig().getBufferProvider()"); //$NON-NLS-1$
 
     if (userID != null && getConfig().getNegotiator() == null)
     {
-      throw new IllegalStateException("A UserID on this connector requires a negotiator to be configured");
+      throw new IllegalStateException("A UserID on this connector requires a negotiator to be configured"); //$NON-NLS-1$
     }
   }
 
@@ -415,7 +415,7 @@ public abstract class Connector extends ChannelMultiplexer implements InternalCo
     @Override
     public String toString()
     {
-      return MessageFormat.format("ConnectorStateEvent[source={0}, oldState={1}, newState={2}]", getSource(),
+      return MessageFormat.format("ConnectorStateEvent[source={0}, oldState={1}, newState={2}]", getSource(), //$NON-NLS-1$
           getOldState(), getNewState());
     }
   }
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/spi/net4j/ConnectorFactory.java b/plugins/org.eclipse.net4j/src/org/eclipse/spi/net4j/ConnectorFactory.java
index 19fd2282cc..7b99259949 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/spi/net4j/ConnectorFactory.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/spi/net4j/ConnectorFactory.java
@@ -17,7 +17,7 @@ import org.eclipse.net4j.util.factory.Factory;
  */
 public abstract class ConnectorFactory extends Factory
 {
-  public static final String PRODUCT_GROUP = "org.eclipse.net4j.connectors";
+  public static final String PRODUCT_GROUP = "org.eclipse.net4j.connectors"; //$NON-NLS-1$
 
   public ConnectorFactory(String type)
   {
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/spi/net4j/Protocol.java b/plugins/org.eclipse.net4j/src/org/eclipse/spi/net4j/Protocol.java
index 80405c044f..4bd411e61f 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/spi/net4j/Protocol.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/spi/net4j/Protocol.java
@@ -144,9 +144,9 @@ public abstract class Protocol<INFRA_STRUCTURE> extends Lifecycle implements IPr
   protected void doBeforeActivate() throws Exception
   {
     super.doBeforeActivate();
-    checkState(channel, "channel");
-    checkState(bufferProvider, "bufferProvider");
-    checkState(executorService, "executorService");
+    checkState(channel, "channel"); //$NON-NLS-1$
+    checkState(bufferProvider, "bufferProvider"); //$NON-NLS-1$
+    checkState(executorService, "executorService"); //$NON-NLS-1$
   }
 
   @Override
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/spi/net4j/ServerProtocolFactory.java b/plugins/org.eclipse.net4j/src/org/eclipse/spi/net4j/ServerProtocolFactory.java
index 9118240790..9747b12b6b 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/spi/net4j/ServerProtocolFactory.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/spi/net4j/ServerProtocolFactory.java
@@ -18,7 +18,7 @@ import org.eclipse.net4j.util.factory.Factory;
  */
 public abstract class ServerProtocolFactory extends Factory
 {
-  public static final String PRODUCT_GROUP = "org.eclipse.net4j.serverProtocols";
+  public static final String PRODUCT_GROUP = "org.eclipse.net4j.serverProtocols"; //$NON-NLS-1$
 
   public ServerProtocolFactory(String type)
   {
author	Victor Roldan Betancort	2009-05-20 17:26:22 +0000
committer	Victor Roldan Betancort	2009-05-20 17:26:22 +0000
commit	0a979565f2cce67cf15709444f0a93e189a5194b (patch)
tree	de5969b4ae8a883d5c10b4e2adc9521ea9842b5c
parent	e41897fe84a47ccdb34156c4ac05b64049fed458 (diff)
download	cdo-0a979565f2cce67cf15709444f0a93e189a5194b.tar.gz cdo-0a979565f2cce67cf15709444f0a93e189a5194b.tar.xz cdo-0a979565f2cce67cf15709444f0a93e189a5194b.zip