resolved some warnings

48 files changed, 122 insertions, 88 deletions

diff --git a/org.eclipse.scout.commons.test/src/org/eclipse/scout/commons/MailUtilityTest.java b/org.eclipse.scout.commons.test/src/org/eclipse/scout/commons/MailUtilityTest.java
index e6f6419769..a3506a81f0 100644
--- a/org.eclipse.scout.commons.test/src/org/eclipse/scout/commons/MailUtilityTest.java
+++ b/org.eclipse.scout.commons.test/src/org/eclipse/scout/commons/MailUtilityTest.java
@@ -20,6 +20,7 @@ import org.junit.Test;
 /**
  *
  */
+@SuppressWarnings("restriction")
 public class MailUtilityTest {
 
   /**
diff --git a/org.eclipse.scout.commons.test/src/org/eclipse/scout/commons/TypeCastUtilityTest.java b/org.eclipse.scout.commons.test/src/org/eclipse/scout/commons/TypeCastUtilityTest.java
index f9f96b6dd3..cad31897cd 100644
--- a/org.eclipse.scout.commons.test/src/org/eclipse/scout/commons/TypeCastUtilityTest.java
+++ b/org.eclipse.scout.commons.test/src/org/eclipse/scout/commons/TypeCastUtilityTest.java
@@ -25,10 +25,10 @@ public class TypeCastUtilityTest extends Assert {
       handler.setLevel(Level.FINEST);
     }
     */
-    Class<?> T;
+    Class<?> genericT;
     //
-    T = TypeCastUtility.getGenericsParameterClass(LongArrayHolder.class, IHolder.class, 0);
-    assertEquals(Long[].class, T);
+    genericT = TypeCastUtility.getGenericsParameterClass(LongArrayHolder.class, IHolder.class, 0);
+    assertEquals(Long[].class, genericT);
     //
     try {
       TypeCastUtility.getGenericsParameterClass(X0.class, X0.class, 0);
@@ -44,14 +44,14 @@ public class TypeCastUtilityTest extends Assert {
     catch (IllegalArgumentException t) {
       //nop
     }
-    T = TypeCastUtility.getGenericsParameterClass(X2.class, X0.class, 0);
-    assertEquals(Data2.class, T);
+    genericT = TypeCastUtility.getGenericsParameterClass(X2.class, X0.class, 0);
+    assertEquals(Data2.class, genericT);
     //
-    T = TypeCastUtility.getGenericsParameterClass(Y3.class, Y0.class, 0);
-    assertEquals(Data3.class, T);
+    genericT = TypeCastUtility.getGenericsParameterClass(Y3.class, Y0.class, 0);
+    assertEquals(Data3.class, genericT);
     //
-    T = TypeCastUtility.getGenericsParameterClass(Y3.class, Y0.class, 1);
-    assertEquals(Flavor3.class, T);
+    genericT = TypeCastUtility.getGenericsParameterClass(Y3.class, Y0.class, 1);
+    assertEquals(Flavor3.class, genericT);
   }
 
   static class Data0 {
diff --git a/org.eclipse.scout.commons/src/org/eclipse/scout/commons/CharsetSafeMimeMessage.java b/org.eclipse.scout.commons/src/org/eclipse/scout/commons/CharsetSafeMimeMessage.java
index 8534c4abf1..4ef84b1bc3 100644
--- a/org.eclipse.scout.commons/src/org/eclipse/scout/commons/CharsetSafeMimeMessage.java
+++ b/org.eclipse.scout.commons/src/org/eclipse/scout/commons/CharsetSafeMimeMessage.java
@@ -20,6 +20,7 @@ import javax.mail.internet.InternetAddress;
 import javax.mail.internet.MimeMessage;
 import javax.mail.internet.MimeUtility;
 
+@SuppressWarnings("restriction")
 public class CharsetSafeMimeMessage extends MimeMessage {
   private String m_charset;
 
diff --git a/org.eclipse.scout.commons/src/org/eclipse/scout/commons/FileUtility.java b/org.eclipse.scout.commons/src/org/eclipse/scout/commons/FileUtility.java
index eba293a571..d37738b7f6 100644
--- a/org.eclipse.scout.commons/src/org/eclipse/scout/commons/FileUtility.java
+++ b/org.eclipse.scout.commons/src/org/eclipse/scout/commons/FileUtility.java
@@ -35,6 +35,7 @@ import java.util.zip.ZipEntry;
  * @since 1.0
  */
 public final class FileUtility {
+  static final int KILO_BYTE = 1024;
 
   private FileUtility() {
   }
@@ -339,7 +340,7 @@ public final class FileUtility {
           output = new FileOutputStream(dest).getChannel();
 
           try {
-            int maxCount = (mbCount * 1024 * 1024) - (32 * 1024);
+            int maxCount = (mbCount * KILO_BYTE * KILO_BYTE) - (32 * KILO_BYTE);
             long size = input.size();
             long position = 0;
             while (position < size) {
diff --git a/org.eclipse.scout.commons/src/org/eclipse/scout/commons/MailUtility.java b/org.eclipse.scout.commons/src/org/eclipse/scout/commons/MailUtility.java
index cb584c563d..0f80cda5c3 100644
--- a/org.eclipse.scout.commons/src/org/eclipse/scout/commons/MailUtility.java
+++ b/org.eclipse.scout.commons/src/org/eclipse/scout/commons/MailUtility.java
@@ -50,6 +50,7 @@ import org.eclipse.scout.commons.exception.ProcessingException;
 import org.eclipse.scout.commons.logger.IScoutLogger;
 import org.eclipse.scout.commons.logger.ScoutLogManager;
 
+@SuppressWarnings("restriction")
 public final class MailUtility {
 
   public static final IScoutLogger LOG = ScoutLogManager.getLogger(MailUtility.class);
diff --git a/org.eclipse.scout.commons/src/org/eclipse/scout/commons/RFCWrapperPart.java b/org.eclipse.scout.commons/src/org/eclipse/scout/commons/RFCWrapperPart.java
index 2ff6a8066b..d302e0fc37 100644
--- a/org.eclipse.scout.commons/src/org/eclipse/scout/commons/RFCWrapperPart.java
+++ b/org.eclipse.scout.commons/src/org/eclipse/scout/commons/RFCWrapperPart.java
@@ -20,6 +20,7 @@ import javax.mail.MessagingException;
 import javax.mail.Multipart;
 import javax.mail.Part;
 
+@SuppressWarnings("restriction")
 public class RFCWrapperPart implements Part {
   private final Part m_rfcPart;
   private final String m_fileName;
diff --git a/org.eclipse.scout.commons/src/org/eclipse/scout/commons/beans/BasicPropertySupport.java b/org.eclipse.scout.commons/src/org/eclipse/scout/commons/beans/BasicPropertySupport.java
index e6dc1eabb5..fa7fafd486 100644
--- a/org.eclipse.scout.commons/src/org/eclipse/scout/commons/beans/BasicPropertySupport.java
+++ b/org.eclipse.scout.commons/src/org/eclipse/scout/commons/beans/BasicPropertySupport.java
@@ -4,7 +4,7 @@
  * 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:
  *     BSI Business Systems Integration AG - initial API and implementation
  ******************************************************************************/
@@ -19,6 +19,7 @@ import java.util.ConcurrentModificationException;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedList;
+import java.util.List;
 import java.util.Map;
 
 import org.eclipse.scout.commons.CompareUtility;
@@ -39,19 +40,19 @@ public class BasicPropertySupport implements IEventListenerSource {
 
   public static final int DEFAULT_INT_VALUE = 0;
   public static final int DEFAULT_DOUBLE_VALUE = 0;
-  public static final Integer DEFAULT_INT = new Integer(DEFAULT_INT_VALUE);
-  public static final Double DEFAULT_DOUBLE = new Double(DEFAULT_DOUBLE_VALUE);
+  public static final Integer DEFAULT_INT = Integer.valueOf(DEFAULT_INT_VALUE);
+  public static final Double DEFAULT_DOUBLE = Double.valueOf(DEFAULT_DOUBLE_VALUE);
   public static final long DEFAULT_LONG_VALUE = DEFAULT_INT_VALUE;
-  public static final Long DEFAULT_LONG = new Long(DEFAULT_LONG_VALUE);
-  private static final Boolean DEFAULT_BOOL = new Boolean(false);
-  private HashMap<String, Object> m_props = new HashMap<String, Object>();
+  public static final Long DEFAULT_LONG = Long.valueOf(DEFAULT_LONG_VALUE);
+  private static final Boolean DEFAULT_BOOL = Boolean.FALSE;
+  private Map<String, Object> m_props = new HashMap<String, Object>();
   private Object m_source;
   // observer
   private Object m_listenerLock = new Object();
-  private ArrayList<Object> m_listeners;
-  private HashMap<String, ArrayList<Object>> m_childListeners;
+  private List<Object> m_listeners;
+  private Map<String, List<Object>> m_childListeners;
   private int m_propertiesChanging;
-  private ArrayList<PropertyChangeEvent> m_propertyEventBuffer;
+  private List<PropertyChangeEvent> m_propertyEventBuffer;
 
   public BasicPropertySupport(Object sourceBean) {
     m_source = sourceBean;
@@ -74,7 +75,7 @@ public class BasicPropertySupport implements IEventListenerSource {
         }
       }
       if (m_childListeners != null) {
-        for (Map.Entry<String, ArrayList<Object>> e : m_childListeners.entrySet()) {
+        for (Map.Entry<String, List<Object>> e : m_childListeners.entrySet()) {
           String context = e.getKey();
           for (Object o : e.getValue()) {
             if (o instanceof WeakReference) {
@@ -141,7 +142,7 @@ public class BasicPropertySupport implements IEventListenerSource {
   }
 
   public void setPropertyInt(String name, int i) {
-    setProperty(name, new Integer(i), DEFAULT_INT);
+    setProperty(name, Integer.valueOf(i), DEFAULT_INT);
   }
 
   public int getPropertyInt(String name) {
@@ -159,7 +160,7 @@ public class BasicPropertySupport implements IEventListenerSource {
   }
 
   public void setPropertyLong(String name, long i) {
-    setProperty(name, new Long(i), DEFAULT_LONG);
+    setProperty(name, Long.valueOf(i), DEFAULT_LONG);
   }
 
   public long getPropertyLong(String name) {
@@ -168,7 +169,7 @@ public class BasicPropertySupport implements IEventListenerSource {
   }
 
   public boolean setPropertyBool(String name, boolean b) {
-    return setProperty(name, new Boolean(b), DEFAULT_BOOL);
+    return setProperty(name, Boolean.valueOf(b), DEFAULT_BOOL);
   }
 
   public boolean getPropertyBool(String name) {
@@ -270,7 +271,7 @@ public class BasicPropertySupport implements IEventListenerSource {
       synchronized (m_listenerLock) {
         removeFromListNoLock(m_listeners, listener);
         if (m_childListeners != null) {
-          for (ArrayList childList : m_childListeners.values()) {
+          for (List childList : m_childListeners.values()) {
             removeFromListNoLock(childList, listener);
           }
         }
@@ -281,9 +282,9 @@ public class BasicPropertySupport implements IEventListenerSource {
   public void addPropertyChangeListener(String propertyName, PropertyChangeListener listener) {
     synchronized (m_listenerLock) {
       if (m_childListeners == null) {
-        m_childListeners = new HashMap<String, ArrayList<Object>>();
+        m_childListeners = new HashMap<String, List<Object>>();
       }
-      ArrayList<Object> children = m_childListeners.get(propertyName);
+      List<Object> children = m_childListeners.get(propertyName);
       if (children == null) {
         children = new ArrayList<Object>();
         m_childListeners.put(propertyName, children);
@@ -295,7 +296,7 @@ public class BasicPropertySupport implements IEventListenerSource {
   public void removePropertyChangeListener(String propertyName, PropertyChangeListener listener) {
     synchronized (m_listenerLock) {
       if (m_childListeners != null) {
-        ArrayList childList = m_childListeners.get(propertyName);
+        List childList = m_childListeners.get(propertyName);
         if (childList != null) {
           removeFromListNoLock(childList, listener);
         }
@@ -303,7 +304,7 @@ public class BasicPropertySupport implements IEventListenerSource {
     }
   }
 
-  private void removeFromListNoLock(ArrayList listeners, PropertyChangeListener listener) {
+  private void removeFromListNoLock(List listeners, PropertyChangeListener listener) {
     if (listeners == null) {
       return;
     }
@@ -321,8 +322,8 @@ public class BasicPropertySupport implements IEventListenerSource {
     else {
       listeners.remove(listener);
     }
-    if (listeners.size() == 0) {
-      listeners.trimToSize();
+    if (listeners.size() == 0 && listeners instanceof ArrayList) {
+      ((ArrayList) listeners).trimToSize();
     }
   }
 
@@ -334,7 +335,7 @@ public class BasicPropertySupport implements IEventListenerSource {
     if (oldValue == newValue) {
       return;
     }
-    firePropertyChangeImpl(propertyName, new Integer(oldValue), new Integer(newValue));
+    firePropertyChangeImpl(propertyName, Integer.valueOf(oldValue), Integer.valueOf(newValue));
   }
 
   public void firePropertyChange(String propertyName, boolean oldValue, boolean newValue) {
@@ -352,8 +353,8 @@ public class BasicPropertySupport implements IEventListenerSource {
   }
 
   private void firePropertyChangeImpl(String propertyName, Object oldValue, Object newValue) {
-    ArrayList l = m_listeners;
-    HashMap m = m_childListeners;
+    List l = m_listeners;
+    Map m = m_childListeners;
     if ((l != null && l.size() > 0) || (m != null && m.size() > 0)) {
       PropertyChangeEvent e = new PropertyChangeEvent(m_source, propertyName, oldValue, newValue);
       firePropertyChangeImpl(e);
@@ -389,7 +390,7 @@ public class BasicPropertySupport implements IEventListenerSource {
         }
         String propertyName = e.getPropertyName();
         if (propertyName != null && m_childListeners != null) {
-          ArrayList childListeners = m_childListeners.get(propertyName);
+          List childListeners = m_childListeners.get(propertyName);
           if (childListeners != null) {
             for (Object o : childListeners) {
               if (o instanceof WeakReference) {
@@ -441,8 +442,8 @@ public class BasicPropertySupport implements IEventListenerSource {
 
   public boolean hasListeners(String propertyName) {
     synchronized (m_listenerLock) {
-      ArrayList l0 = m_listeners;
-      ArrayList l1 = null;
+      List l0 = m_listeners;
+      List l1 = null;
       if (propertyName != null) {
         l1 = m_childListeners.get(propertyName);
       }
diff --git a/org.eclipse.scout.commons/src/org/eclipse/scout/commons/beans/FastPropertyDescriptor.java b/org.eclipse.scout.commons/src/org/eclipse/scout/commons/beans/FastPropertyDescriptor.java
index 283b0428c7..b323da9126 100644
--- a/org.eclipse.scout.commons/src/org/eclipse/scout/commons/beans/FastPropertyDescriptor.java
+++ b/org.eclipse.scout.commons/src/org/eclipse/scout/commons/beans/FastPropertyDescriptor.java
@@ -126,7 +126,7 @@ public class FastPropertyDescriptor {
     if (this == obj) {
       return true;
     }
-    if (obj != null && obj instanceof FastPropertyDescriptor) {
+    if (obj instanceof FastPropertyDescriptor) {
       FastPropertyDescriptor other = (FastPropertyDescriptor) obj;
       Method otherReadMethod = other.getReadMethod();
       Method otherWriteMethod = other.getWriteMethod();
diff --git a/org.eclipse.scout.commons/src/org/eclipse/scout/commons/csv/ArrayConsumer.java b/org.eclipse.scout.commons/src/org/eclipse/scout/commons/csv/ArrayConsumer.java
index cdfc5e487c..436f78c03e 100644
--- a/org.eclipse.scout.commons/src/org/eclipse/scout/commons/csv/ArrayConsumer.java
+++ b/org.eclipse.scout.commons/src/org/eclipse/scout/commons/csv/ArrayConsumer.java
@@ -4,7 +4,7 @@
  * 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:
  *     BSI Business Systems Integration AG - initial API and implementation
  ******************************************************************************/
@@ -16,7 +16,7 @@ import java.util.List;
 
 public class ArrayConsumer implements IDataConsumer {
 
-  private ArrayList<Object[]> m_rows;
+  private List<Object[]> m_rows;
 
   public ArrayConsumer() {
     m_rows = new ArrayList<Object[]>();
diff --git a/org.eclipse.scout.commons/src/org/eclipse/scout/commons/csv/CsvHelper.java b/org.eclipse.scout.commons/src/org/eclipse/scout/commons/csv/CsvHelper.java
index 7183e2d926..b036a46e0e 100644
--- a/org.eclipse.scout.commons/src/org/eclipse/scout/commons/csv/CsvHelper.java
+++ b/org.eclipse.scout.commons/src/org/eclipse/scout/commons/csv/CsvHelper.java
@@ -49,13 +49,13 @@ public class CsvHelper {
   public static final String IGNORED_COLUMN_NAME = "null";
 
   private Locale m_locale;
-  private char m_separatorChar;// ;
-  private char m_textDelimiterChar;// "
-  private String m_lineSeparator;// \n
+  private char m_separatorChar;// ";"
+  private char m_textDelimiterChar;// "\""
+  private String m_lineSeparator;// "\n"
   private int m_colCount;
-  private ArrayList<String> m_colNames;
-  private ArrayList<String> m_colTypes;
-  private ArrayList<Format> m_colFormat;
+  private List<String> m_colNames;
+  private List<String> m_colTypes;
+  private List<Format> m_colFormat;
   private boolean[] m_ignoredColumns;
 
   public CsvHelper() {
@@ -67,10 +67,7 @@ public class CsvHelper {
   }
 
   public CsvHelper(Locale locale, char separatorChar, char textDelimiterChar, String lineSeparator) {
-    if (locale == null) {
-      locale = NlsUtility.getDefaultLocale();
-    }
-    m_locale = locale;
+    m_locale = locale == null ? NlsUtility.getDefaultLocale() : locale;
     m_separatorChar = separatorChar != 0x00 ? separatorChar : ';';
     m_textDelimiterChar = textDelimiterChar != 0x00 ? textDelimiterChar : '"';
     m_lineSeparator = lineSeparator != null ? lineSeparator : "\n";
@@ -215,7 +212,7 @@ public class CsvHelper {
         headerRowCount--;
       }
       // data
-      ArrayList<String> cellList;
+      List<String> cellList;
       lineNr = 1;
       while ((cellList = importRow(reader)) != null && lineNr <= rowCount) {
         // fill up with empty row if allowed
@@ -225,7 +222,7 @@ public class CsvHelper {
         // convert data types
         ArrayList<Object> objList = new ArrayList<Object>(cellList.size());
         for (colIndex = 0; colIndex < cellList.size(); colIndex++) {
-          if (m_ignoredColumns == null || m_ignoredColumns.length == 0 || m_ignoredColumns.length < colIndex || m_ignoredColumns[colIndex] == false) {
+          if (m_ignoredColumns == null || m_ignoredColumns.length == 0 || m_ignoredColumns.length < colIndex || !m_ignoredColumns[colIndex]) {
             cell = cellList.get(colIndex);
             objList.add(importCell(cell, getColumnFormat(colIndex)));
           }
@@ -315,7 +312,7 @@ public class CsvHelper {
       }
     }
     catch (IOException e) {
-      throw new ProcessingException("line=" + line + " colIndex=" + colIndex + " value=" + val + " cell=" + cell);
+      throw new ProcessingException("line=" + line + " colIndex=" + colIndex + " value=" + val + " cell=" + cell, e);
     }
   }
 
@@ -352,7 +349,7 @@ public class CsvHelper {
       writer.write(m_lineSeparator);
     }
     catch (IOException e) {
-      throw new ProcessingException("line=" + Arrays.asList(row));
+      throw new ProcessingException("line=" + Arrays.asList(row), e);
     }
     finally {
       if (closeWriter) {
@@ -374,8 +371,8 @@ public class CsvHelper {
     }
   }
 
-  private ArrayList<String> importRow(Reader reader) throws IOException {
-    ArrayList<String> cellList = new ArrayList<String>(Math.max(m_colCount, 2));
+  private List<String> importRow(Reader reader) throws IOException {
+    List<String> cellList = new ArrayList<String>(Math.max(m_colCount, 2));
     boolean inString = false;
     StringBuffer curBuf = new StringBuffer();
     String token;
@@ -460,11 +457,10 @@ public class CsvHelper {
   private Object importCell(String text, Format f) throws ProcessingException {
     if (text != null && f != null) {
       try {
-        text = text.trim();
-        return f.parseObject(text);
+        return f.parseObject(text.trim());
       }
       catch (ParseException e) {
-        throw new ProcessingException("text=" + text + " format=" + f);
+        throw new ProcessingException("text=" + text + " format=" + f, e);
       }
     }
     else {
@@ -567,7 +563,7 @@ public class CsvHelper {
       return importRow(bufferedReader);
     }
     catch (Exception e) {
-      throw new ProcessingException("reading header row");
+      throw new ProcessingException("reading header row", e);
     }
     finally {
       if (bufferedReader != null) {
diff --git a/org.eclipse.scout.commons/src/org/eclipse/scout/commons/nls/NlsUtility.java b/org.eclipse.scout.commons/src/org/eclipse/scout/commons/nls/NlsUtility.java
index 7dc1032967..c4b4cbf057 100644
--- a/org.eclipse.scout.commons/src/org/eclipse/scout/commons/nls/NlsUtility.java
+++ b/org.eclipse.scout.commons/src/org/eclipse/scout/commons/nls/NlsUtility.java
@@ -117,7 +117,7 @@ public final class NlsUtility {
         while (m.find(start)) {
           b.append(text.substring(start, m.start()));
           int index = Integer.parseInt(m.group(1));
-          if (messageArguments != null && index < messageArguments.length) {
+          if (index < messageArguments.length) {
             if (messageArguments[index] != null) {
               b.append(messageArguments[index]);
             }
diff --git a/org.eclipse.scout.commons/src/org/eclipse/scout/commons/prefs/UserPreferences.java b/org.eclipse.scout.commons/src/org/eclipse/scout/commons/prefs/UserPreferences.java
index 2bb0760c77..d801350553 100644
--- a/org.eclipse.scout.commons/src/org/eclipse/scout/commons/prefs/UserPreferences.java
+++ b/org.eclipse.scout.commons/src/org/eclipse/scout/commons/prefs/UserPreferences.java
@@ -4,7 +4,7 @@
  * 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:
  *     BSI Business Systems Integration AG - initial API and implementation
  ******************************************************************************/
@@ -62,7 +62,7 @@ public class UserPreferences extends EclipsePreferences {
     // ONLY in case the property set is empty load fom legacy instance scope
     if (keys().length == 0) {
       try {
-        IEclipsePreferences oldPrefs = new InstanceScope().getNode(name());
+        IEclipsePreferences oldPrefs = InstanceScope.INSTANCE.getNode(name());
         for (String key : oldPrefs.keys()) {
           String value = oldPrefs.get(key, null);
           if (value != null) {
diff --git a/org.eclipse.scout.commons/src/org/eclipse/scout/commons/xmlparser/ScoutXmlDocument.java b/org.eclipse.scout.commons/src/org/eclipse/scout/commons/xmlparser/ScoutXmlDocument.java
index 34ff6b101f..1efaf85ee1 100644
--- a/org.eclipse.scout.commons/src/org/eclipse/scout/commons/xmlparser/ScoutXmlDocument.java
+++ b/org.eclipse.scout.commons/src/org/eclipse/scout/commons/xmlparser/ScoutXmlDocument.java
@@ -1673,10 +1673,8 @@ public class ScoutXmlDocument implements Serializable {
      */
     public boolean hasAttributeExact(String name) {
       if (this.hasAttributes()) {
-        Iterator<P_Attribute> iterator = m_attributes.iterator();
-
-        for (int i = 0; iterator.hasNext(); i++) {
-          if (iterator.next().getNamePrefixed().equals(name)) {
+        for (Iterator iterator = m_attributes.iterator(); iterator.hasNext();) {
+          if (((P_AbstractNode) iterator.next()).getNamePrefixed().equals(name)) {
             return true;
           }
         }
diff --git a/org.eclipse.scout.http.servletfilter/src/org/eclipse/scout/http/servletfilter/FilterConfigInjection.java b/org.eclipse.scout.http.servletfilter/src/org/eclipse/scout/http/servletfilter/FilterConfigInjection.java
index a89a63387e..6387a00cc4 100644
--- a/org.eclipse.scout.http.servletfilter/src/org/eclipse/scout/http/servletfilter/FilterConfigInjection.java
+++ b/org.eclipse.scout.http.servletfilter/src/org/eclipse/scout/http/servletfilter/FilterConfigInjection.java
@@ -4,7 +4,7 @@
  * 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:
  *     BSI Business Systems Integration AG - initial API and implementation
  ******************************************************************************/
@@ -175,6 +175,7 @@ public class FilterConfigInjection {
     }
 
     @Override
+    @SuppressWarnings("unchecked")
     public Enumeration getInitParameterNames() {
       TreeSet<String> names = new TreeSet<String>(m_injectedMap.keySet());
       for (Enumeration en = m_config.getInitParameterNames(); en.hasMoreElements();) {
diff --git a/org.eclipse.scout.http.servletfilter/src/org/eclipse/scout/http/servletfilter/internal/FilterConfigImpl.java b/org.eclipse.scout.http.servletfilter/src/org/eclipse/scout/http/servletfilter/internal/FilterConfigImpl.java
index 4bc9e2850b..97e600fa99 100644
--- a/org.eclipse.scout.http.servletfilter/src/org/eclipse/scout/http/servletfilter/internal/FilterConfigImpl.java
+++ b/org.eclipse.scout.http.servletfilter/src/org/eclipse/scout/http/servletfilter/internal/FilterConfigImpl.java
@@ -4,7 +4,7 @@
  * 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:
  *     BSI Business Systems Integration AG - initial API and implementation
  ******************************************************************************/
@@ -125,6 +125,7 @@ public class FilterConfigImpl implements FilterConfig {
   }
 
   @Override
+  @SuppressWarnings("unchecked")
   public Enumeration getInitParameterNames() {
     return new Vector<String>(m_initParams.keySet()).elements();
   }
diff --git a/org.eclipse.scout.net/src/org/eclipse/scout/net/EclipseProxySelector.java b/org.eclipse.scout.net/src/org/eclipse/scout/net/EclipseProxySelector.java
index d4abecf2ff..1c382d8d82 100644
--- a/org.eclipse.scout.net/src/org/eclipse/scout/net/EclipseProxySelector.java
+++ b/org.eclipse.scout.net/src/org/eclipse/scout/net/EclipseProxySelector.java
@@ -163,6 +163,7 @@ public final class EclipseProxySelector extends ProxySelector {
     ServiceReference ref = context.getServiceReference(IProxyService.class.getName());
     if (ref != null) {
       try {
+        @SuppressWarnings("unchecked")
         IProxyService service = (IProxyService) context.getService(ref);
 
         //Necessary for backward compatibility to Eclipse 3.4 needed for Lotus Notes 8.5.2
diff --git a/org.eclipse.scout.net/src/org/eclipse/scout/net/internal/InternalEclipseAuthenticator.java b/org.eclipse.scout.net/src/org/eclipse/scout/net/internal/InternalEclipseAuthenticator.java
index 0750bf4478..cd791a4016 100644
--- a/org.eclipse.scout.net/src/org/eclipse/scout/net/internal/InternalEclipseAuthenticator.java
+++ b/org.eclipse.scout.net/src/org/eclipse/scout/net/internal/InternalEclipseAuthenticator.java
@@ -4,7 +4,7 @@
  * 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:
  *     BSI Business Systems Integration AG - initial API and implementation
  ******************************************************************************/
@@ -25,6 +25,7 @@ public class InternalEclipseAuthenticator extends Authenticator {
   public InternalEclipseAuthenticator() {
   }
 
+  @SuppressWarnings("unchecked")
   @Override
   protected PasswordAuthentication getPasswordAuthentication() {
     PasswordAuthentication result = null;
diff --git a/org.eclipse.scout.rt.client/src/org/eclipse/scout/rt/client/services/common/exceptionhandler/ErrorHandler.java b/org.eclipse.scout.rt.client/src/org/eclipse/scout/rt/client/services/common/exceptionhandler/ErrorHandler.java
index c06d0b02b8..92f6153ebe 100644
--- a/org.eclipse.scout.rt.client/src/org/eclipse/scout/rt/client/services/common/exceptionhandler/ErrorHandler.java
+++ b/org.eclipse.scout.rt.client/src/org/eclipse/scout/rt/client/services/common/exceptionhandler/ErrorHandler.java
@@ -201,7 +201,6 @@ public class ErrorHandler {
     StringWriter buf = new StringWriter();
     t = exception;
     String indent = "";
-    int index = 0;
     while (t != null) {
       String s = null;
       if (t instanceof ProcessingException) {
@@ -219,7 +218,6 @@ public class ErrorHandler {
       }
       buf.append("\n");
       // next
-      index++;
       indent += "  ";
       t = t.getCause();
     }
diff --git a/org.eclipse.scout.rt.client/src/org/eclipse/scout/rt/client/ui/basic/table/columnfilter/SmartColumnFilter.java b/org.eclipse.scout.rt.client/src/org/eclipse/scout/rt/client/ui/basic/table/columnfilter/SmartColumnFilter.java
index ab8f7e156d..69b59031db 100644
--- a/org.eclipse.scout.rt.client/src/org/eclipse/scout/rt/client/ui/basic/table/columnfilter/SmartColumnFilter.java
+++ b/org.eclipse.scout.rt.client/src/org/eclipse/scout/rt/client/ui/basic/table/columnfilter/SmartColumnFilter.java
@@ -29,7 +29,6 @@ import org.eclipse.scout.rt.shared.services.lookup.LookupRow;
  * @deprecated This class will be removed in the next release because it is not used anymore.
  */
 @Deprecated
-@SuppressWarnings("deprecation")
 public class SmartColumnFilter<T> implements ITableColumnFilter<T>, Serializable {
   private static final long serialVersionUID = 1L;
   private ISmartColumn<T> m_column;
diff --git a/org.eclipse.scout.rt.client/src/org/eclipse/scout/rt/client/ui/desktop/outline/AbstractOutline.java b/org.eclipse.scout.rt.client/src/org/eclipse/scout/rt/client/ui/desktop/outline/AbstractOutline.java
index 667d8bd167..4433726853 100644
--- a/org.eclipse.scout.rt.client/src/org/eclipse/scout/rt/client/ui/desktop/outline/AbstractOutline.java
+++ b/org.eclipse.scout.rt.client/src/org/eclipse/scout/rt/client/ui/desktop/outline/AbstractOutline.java
@@ -188,6 +188,7 @@ public abstract class AbstractOutline extends AbstractTree implements IOutline {
   public void refreshPages(final Class... pageTypes) {
     final ArrayList<IPage> candidates = new ArrayList<IPage>();
     ITreeVisitor v = new ITreeVisitor() {
+      @SuppressWarnings("unchecked")
       @Override
       public boolean visit(ITreeNode node) {
         IPage page = (IPage) node;
diff --git a/org.eclipse.scout.rt.client/src/org/eclipse/scout/rt/client/ui/form/fields/listbox/AbstractListBox.java b/org.eclipse.scout.rt.client/src/org/eclipse/scout/rt/client/ui/form/fields/listbox/AbstractListBox.java
index 76f1585f12..e3ed77d2dc 100644
--- a/org.eclipse.scout.rt.client/src/org/eclipse/scout/rt/client/ui/form/fields/listbox/AbstractListBox.java
+++ b/org.eclipse.scout.rt.client/src/org/eclipse/scout/rt/client/ui/form/fields/listbox/AbstractListBox.java
@@ -342,6 +342,7 @@ public abstract class AbstractListBox<T> extends AbstractValueField<T[]> impleme
     m_fields = fieldList.toArray(new IFormField[0]);
   }
 
+  @SuppressWarnings("unchecked")
   public ListBoxFilterBox getListBoxFilterBox() {
     return getFieldByClass(ListBoxFilterBox.class);
   }
@@ -957,14 +958,17 @@ public abstract class AbstractListBox<T> extends AbstractValueField<T[]> impleme
       return true;
     }
 
+    @SuppressWarnings("unchecked")
     public KeyColumn getKeyColumn() {
       return getColumnSet().getColumnByClass(KeyColumn.class);
     }
 
+    @SuppressWarnings("unchecked")
     public TextColumn getTextColumn() {
       return getColumnSet().getColumnByClass(TextColumn.class);
     }
 
+    @SuppressWarnings("unchecked")
     public ActiveColumn getActiveColumn() {
       return getColumnSet().getColumnByClass(ActiveColumn.class);
     }
diff --git a/org.eclipse.scout.rt.client/src/org/eclipse/scout/rt/client/ui/form/fields/mailfield/AbstractMailField.java b/org.eclipse.scout.rt.client/src/org/eclipse/scout/rt/client/ui/form/fields/mailfield/AbstractMailField.java
index ce47e3dc4e..1819520b6c 100644
--- a/org.eclipse.scout.rt.client/src/org/eclipse/scout/rt/client/ui/form/fields/mailfield/AbstractMailField.java
+++ b/org.eclipse.scout.rt.client/src/org/eclipse/scout/rt/client/ui/form/fields/mailfield/AbstractMailField.java
@@ -28,6 +28,7 @@ import org.eclipse.scout.service.SERVICES;
 /**
  * @version 3.x
  */
+@SuppressWarnings("restriction")
 public abstract class AbstractMailField extends AbstractValueField<MimeMessage> implements IMailField {
   private IMailFieldUIFacade m_uiFacade;
   private boolean m_mailEditor;
diff --git a/org.eclipse.scout.rt.client/src/org/eclipse/scout/rt/client/ui/form/fields/mailfield/IMailField.java b/org.eclipse.scout.rt.client/src/org/eclipse/scout/rt/client/ui/form/fields/mailfield/IMailField.java
index 0b48d3ed32..d0245d9493 100644
--- a/org.eclipse.scout.rt.client/src/org/eclipse/scout/rt/client/ui/form/fields/mailfield/IMailField.java
+++ b/org.eclipse.scout.rt.client/src/org/eclipse/scout/rt/client/ui/form/fields/mailfield/IMailField.java
@@ -17,6 +17,7 @@ import org.eclipse.scout.rt.client.ui.form.fields.IValueField;
 /**
  * @version 3.x
  */
+@SuppressWarnings("restriction")
 public interface IMailField extends IValueField<MimeMessage> {
   String PROP_LABEL_FROM = "labelFrom";
   String PROP_LABEL_TO = "labelTo";
diff --git a/org.eclipse.scout.rt.client/src/org/eclipse/scout/rt/client/ui/form/fields/mailfield/IMailFieldUIFacade.java b/org.eclipse.scout.rt.client/src/org/eclipse/scout/rt/client/ui/form/fields/mailfield/IMailFieldUIFacade.java
index a5b6201726..399c222399 100644
--- a/org.eclipse.scout.rt.client/src/org/eclipse/scout/rt/client/ui/form/fields/mailfield/IMailFieldUIFacade.java
+++ b/org.eclipse.scout.rt.client/src/org/eclipse/scout/rt/client/ui/form/fields/mailfield/IMailFieldUIFacade.java
@@ -4,7 +4,7 @@
  * 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:
  *     BSI Business Systems Integration AG - initial API and implementation
  ******************************************************************************/
@@ -18,6 +18,7 @@ import javax.mail.internet.MimeMessage;
 /**
  * @version 3.x
  */
+@SuppressWarnings("restriction")
 public interface IMailFieldUIFacade {
 
   boolean setMailFromUI(MimeMessage message);
diff --git a/org.eclipse.scout.rt.client/src/org/eclipse/scout/rt/client/ui/form/fields/pagefield/AbstractPageField.java b/org.eclipse.scout.rt.client/src/org/eclipse/scout/rt/client/ui/form/fields/pagefield/AbstractPageField.java
index bb2ec19416..5166bbfa89 100644
--- a/org.eclipse.scout.rt.client/src/org/eclipse/scout/rt/client/ui/form/fields/pagefield/AbstractPageField.java
+++ b/org.eclipse.scout.rt.client/src/org/eclipse/scout/rt/client/ui/form/fields/pagefield/AbstractPageField.java
@@ -105,16 +105,19 @@ public abstract class AbstractPageField<T extends IPage> extends AbstractGroupBo
     }
   }
 
+  @SuppressWarnings("unchecked")
   @Override
   public IWrappedFormField<IForm> getDetailFormField() {
     return getFieldByClass(DetailFormField.class);
   }
 
+  @SuppressWarnings("unchecked")
   @Override
   public ITableField<ITable> getTableField() {
     return getFieldByClass(TableField.class);
   }
 
+  @SuppressWarnings("unchecked")
   @Override
   public IWrappedFormField<IForm> getSearchFormField() {
     return getFieldByClass(SearchFormField.class);
diff --git a/org.eclipse.scout.rt.client/src/org/eclipse/scout/rt/client/ui/form/fields/treebox/AbstractTreeBox.java b/org.eclipse.scout.rt.client/src/org/eclipse/scout/rt/client/ui/form/fields/treebox/AbstractTreeBox.java
index d30012c78d..41424d631a 100644
--- a/org.eclipse.scout.rt.client/src/org/eclipse/scout/rt/client/ui/form/fields/treebox/AbstractTreeBox.java
+++ b/org.eclipse.scout.rt.client/src/org/eclipse/scout/rt/client/ui/form/fields/treebox/AbstractTreeBox.java
@@ -371,6 +371,7 @@ public abstract class AbstractTreeBox<T> extends AbstractValueField<T[]> impleme
     getTree().disposeTree();
   }
 
+  @SuppressWarnings("unchecked")
   public TreeBoxFilterBox getTreeBoxFilterBox() {
     return getFieldByClass(TreeBoxFilterBox.class);
   }
diff --git a/org.eclipse.scout.rt.extension.client/src/org/eclipse/scout/rt/extension/client/Activator.java b/org.eclipse.scout.rt.extension.client/src/org/eclipse/scout/rt/extension/client/Activator.java
index 84937104e4..b3254096ae 100644
--- a/org.eclipse.scout.rt.extension.client/src/org/eclipse/scout/rt/extension/client/Activator.java
+++ b/org.eclipse.scout.rt.extension.client/src/org/eclipse/scout/rt/extension/client/Activator.java
@@ -107,6 +107,7 @@ public class Activator extends Plugin {
 
   private IExtensionRegistry getExtensionRegistry(BundleContext context) {
     ServiceReference ref = context.getServiceReference(IExtensionRegistry.class.getName());
+    @SuppressWarnings("unchecked")
     IExtensionRegistry reg = (IExtensionRegistry) context.getService(ref);
     context.ungetService(ref);
     return reg;
diff --git a/org.eclipse.scout.rt.server/src/org/eclipse/scout/rt/server/ServiceTunnelServlet.java b/org.eclipse.scout.rt.server/src/org/eclipse/scout/rt/server/ServiceTunnelServlet.java
index cbdbe70a44..1c7385ecb7 100644
--- a/org.eclipse.scout.rt.server/src/org/eclipse/scout/rt/server/ServiceTunnelServlet.java
+++ b/org.eclipse.scout.rt.server/src/org/eclipse/scout/rt/server/ServiceTunnelServlet.java
@@ -347,6 +347,7 @@ public class ServiceTunnelServlet extends HttpServletEx {
     ServiceReference ref = context.getServiceReference(IExtensionRegistry.class.getName());
     Bundle bundle = null;
     if (ref != null) {
+      @SuppressWarnings("unchecked")
       IExtensionRegistry reg = (IExtensionRegistry) context.getService(ref);
       if (reg != null) {
         IExtensionPoint xpServlet = reg.getExtensionPoint("org.eclipse.equinox.http.registry.servlets");
diff --git a/org.eclipse.scout.rt.server/src/org/eclipse/scout/rt/server/admin/html/view/ServicesView.java b/org.eclipse.scout.rt.server/src/org/eclipse/scout/rt/server/admin/html/view/ServicesView.java
index 06e851d4e3..98b23ac530 100644
--- a/org.eclipse.scout.rt.server/src/org/eclipse/scout/rt/server/admin/html/view/ServicesView.java
+++ b/org.eclipse.scout.rt.server/src/org/eclipse/scout/rt/server/admin/html/view/ServicesView.java
@@ -65,6 +65,7 @@ public class ServicesView extends DefaultView {
           try {
             ArrayList<ServiceInspector> list = new ArrayList<ServiceInspector>(refs.length);
             for (ServiceReference ref : refs) {
+              @SuppressWarnings("unchecked")
               Object s = context.getService(ref);
               if (s != null) {
                 list.add(new ServiceInspector(s));
diff --git a/org.eclipse.scout.rt.server/src/org/eclipse/scout/rt/server/services/common/imap/AbstractIMAPService.java b/org.eclipse.scout.rt.server/src/org/eclipse/scout/rt/server/services/common/imap/AbstractIMAPService.java
index 096497a020..4fba49e28a 100644
--- a/org.eclipse.scout.rt.server/src/org/eclipse/scout/rt/server/services/common/imap/AbstractIMAPService.java
+++ b/org.eclipse.scout.rt.server/src/org/eclipse/scout/rt/server/services/common/imap/AbstractIMAPService.java
@@ -27,6 +27,7 @@ import org.eclipse.scout.commons.annotations.Order;
 import org.eclipse.scout.commons.exception.ProcessingException;
 import org.eclipse.scout.service.AbstractService;
 
+@SuppressWarnings("restriction")
 public abstract class AbstractIMAPService extends AbstractService implements IIMAPService {
 
   private String m_host;
diff --git a/org.eclipse.scout.rt.server/src/org/eclipse/scout/rt/server/services/common/imap/IIMAPService.java b/org.eclipse.scout.rt.server/src/org/eclipse/scout/rt/server/services/common/imap/IIMAPService.java
index e0366efe8e..f9164425b7 100644
--- a/org.eclipse.scout.rt.server/src/org/eclipse/scout/rt/server/services/common/imap/IIMAPService.java
+++ b/org.eclipse.scout.rt.server/src/org/eclipse/scout/rt/server/services/common/imap/IIMAPService.java
@@ -4,7 +4,7 @@
  * 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:
  *     BSI Business Systems Integration AG - initial API and implementation
  ******************************************************************************/
@@ -19,6 +19,7 @@ import org.eclipse.scout.service.IService;
  * This service is normally registered as a scout server service extension, so
  * it exists per session
  */
+@SuppressWarnings("restriction")
 public interface IIMAPService extends IService {
 
   Message[] getUnreadMessages() throws ProcessingException;
diff --git a/org.eclipse.scout.rt.server/src/org/eclipse/scout/rt/server/services/common/imap/ImapAdapter.java b/org.eclipse.scout.rt.server/src/org/eclipse/scout/rt/server/services/common/imap/ImapAdapter.java
index 9dc94e1b42..34d462573a 100644
--- a/org.eclipse.scout.rt.server/src/org/eclipse/scout/rt/server/services/common/imap/ImapAdapter.java
+++ b/org.eclipse.scout.rt.server/src/org/eclipse/scout/rt/server/services/common/imap/ImapAdapter.java
@@ -28,6 +28,7 @@ import org.eclipse.scout.commons.ListUtility;
 import org.eclipse.scout.commons.StringUtility;
 import org.eclipse.scout.commons.exception.ProcessingException;
 
+@SuppressWarnings("restriction")
 public class ImapAdapter {
 
   public static final String TRASH_FOLDER_NAME = "Trash";
diff --git a/org.eclipse.scout.rt.server/src/org/eclipse/scout/rt/server/services/common/jdbc/internal/exec/StatementProcessor.java b/org.eclipse.scout.rt.server/src/org/eclipse/scout/rt/server/services/common/jdbc/internal/exec/StatementProcessor.java
index 965ea4a3ae..bfbe237da0 100644
--- a/org.eclipse.scout.rt.server/src/org/eclipse/scout/rt/server/services/common/jdbc/internal/exec/StatementProcessor.java
+++ b/org.eclipse.scout.rt.server/src/org/eclipse/scout/rt/server/services/common/jdbc/internal/exec/StatementProcessor.java
@@ -275,7 +275,6 @@ public class StatementProcessor implements IStatementProcessor {
     PreparedStatement ps = null;
     ResultSet rs = null;
     try {
-      int rowCount = 0;
       while (hasNextInputBatch()) {
         nextInputBatch();
         prepareInputStatementAndBinds();
@@ -288,7 +287,6 @@ public class StatementProcessor implements IStatementProcessor {
           for (Object[] row : processResultRows(rs, m_maxRowCount)) {
             nextOutputBatch();
             consumeSelectIntoRow(row);
-            rowCount++;
           }
         }
         finally {
diff --git a/org.eclipse.scout.rt.server/src/org/eclipse/scout/rt/server/services/common/jms/IJmsCallback.java b/org.eclipse.scout.rt.server/src/org/eclipse/scout/rt/server/services/common/jms/IJmsCallback.java
index b680de5c9b..cc413d235e 100644
--- a/org.eclipse.scout.rt.server/src/org/eclipse/scout/rt/server/services/common/jms/IJmsCallback.java
+++ b/org.eclipse.scout.rt.server/src/org/eclipse/scout/rt/server/services/common/jms/IJmsCallback.java
@@ -4,7 +4,7 @@
  * 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:
  *     BSI Business Systems Integration AG - initial API and implementation
  ******************************************************************************/
@@ -21,6 +21,7 @@ import org.eclipse.scout.service.IService;
  * called via JMS. Inherits from IService to make sure the service can be
  * retrieved from Service Registry.
  */
+@SuppressWarnings("restriction")
 public interface IJmsCallback extends IService {
 
   /**
diff --git a/org.eclipse.scout.rt.server/src/org/eclipse/scout/rt/server/services/common/jms/JmsObserver.java b/org.eclipse.scout.rt.server/src/org/eclipse/scout/rt/server/services/common/jms/JmsObserver.java
index 8f4f152fc4..bef4b79605 100644
--- a/org.eclipse.scout.rt.server/src/org/eclipse/scout/rt/server/services/common/jms/JmsObserver.java
+++ b/org.eclipse.scout.rt.server/src/org/eclipse/scout/rt/server/services/common/jms/JmsObserver.java
@@ -4,7 +4,7 @@
  * 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:
  *     BSI Business Systems Integration AG - initial API and implementation
  ******************************************************************************/
@@ -33,6 +33,7 @@ import org.eclipse.scout.rt.server.services.common.jms.internal.JmsTransactionMe
  * J2eeJmsObserver implementation with anchor in servlet context J2eeJmsObserver
  * expects to find its IServerSession in the servlet context
  */
+@SuppressWarnings("restriction")
 public class JmsObserver {
   private static final IScoutLogger LOG = ScoutLogManager.getLogger(JmsObserver.class);
 
diff --git a/org.eclipse.scout.rt.server/src/org/eclipse/scout/rt/server/services/common/jms/internal/JmsTransactionMember.java b/org.eclipse.scout.rt.server/src/org/eclipse/scout/rt/server/services/common/jms/internal/JmsTransactionMember.java
index e8d86ea596..2439f9285c 100644
--- a/org.eclipse.scout.rt.server/src/org/eclipse/scout/rt/server/services/common/jms/internal/JmsTransactionMember.java
+++ b/org.eclipse.scout.rt.server/src/org/eclipse/scout/rt/server/services/common/jms/internal/JmsTransactionMember.java
@@ -57,6 +57,7 @@ import org.eclipse.scout.rt.server.transaction.AbstractTransactionMember;
  * @since Build 192
  *        (Extracted out of JmsService class to an autonomous class)
  */
+@SuppressWarnings("restriction")
 public class JmsTransactionMember extends AbstractTransactionMember {
   private static final IScoutLogger LOG = ScoutLogManager.getLogger(JmsTransactionMember.class);
 
diff --git a/org.eclipse.scout.rt.server/src/org/eclipse/scout/rt/server/services/common/pop3/IPOP3MessageVisitor.java b/org.eclipse.scout.rt.server/src/org/eclipse/scout/rt/server/services/common/pop3/IPOP3MessageVisitor.java
index 99ccf6c38a..67720e0a36 100644
--- a/org.eclipse.scout.rt.server/src/org/eclipse/scout/rt/server/services/common/pop3/IPOP3MessageVisitor.java
+++ b/org.eclipse.scout.rt.server/src/org/eclipse/scout/rt/server/services/common/pop3/IPOP3MessageVisitor.java
@@ -4,7 +4,7 @@
  * 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:
  *     BSI Business Systems Integration AG - initial API and implementation
  ******************************************************************************/
@@ -15,6 +15,7 @@ import javax.mail.MessagingException;
 
 import org.eclipse.scout.commons.exception.ProcessingException;
 
+@SuppressWarnings("restriction")
 public interface IPOP3MessageVisitor {
   /**
    * @return true to continue visiting, false to break up further visiting
diff --git a/org.eclipse.scout.rt.server/src/org/eclipse/scout/rt/server/services/common/pop3/POP3Adapter.java b/org.eclipse.scout.rt.server/src/org/eclipse/scout/rt/server/services/common/pop3/POP3Adapter.java
index 4baa930225..84983b154b 100644
--- a/org.eclipse.scout.rt.server/src/org/eclipse/scout/rt/server/services/common/pop3/POP3Adapter.java
+++ b/org.eclipse.scout.rt.server/src/org/eclipse/scout/rt/server/services/common/pop3/POP3Adapter.java
@@ -4,7 +4,7 @@
  * 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:
  *     BSI Business Systems Integration AG - initial API and implementation
  ******************************************************************************/
@@ -30,6 +30,7 @@ import javax.mail.Store;
 import org.eclipse.scout.commons.StringUtility;
 import org.eclipse.scout.commons.exception.ProcessingException;
 
+@SuppressWarnings("restriction")
 public class POP3Adapter {
 
   public static final String TRASH_FOLDER_NAME = "Trash";
diff --git a/org.eclipse.scout.rt.server/src/org/eclipse/scout/rt/server/services/common/smtp/AbstractSMTPService.java b/org.eclipse.scout.rt.server/src/org/eclipse/scout/rt/server/services/common/smtp/AbstractSMTPService.java
index 922980134c..d897258162 100644
--- a/org.eclipse.scout.rt.server/src/org/eclipse/scout/rt/server/services/common/smtp/AbstractSMTPService.java
+++ b/org.eclipse.scout.rt.server/src/org/eclipse/scout/rt/server/services/common/smtp/AbstractSMTPService.java
@@ -28,6 +28,7 @@ import org.eclipse.scout.commons.logger.IScoutLogger;
 import org.eclipse.scout.commons.logger.ScoutLogManager;
 import org.eclipse.scout.service.AbstractService;
 
+@SuppressWarnings("restriction")
 public abstract class AbstractSMTPService extends AbstractService implements ISMTPService {
   private static final IScoutLogger LOG = ScoutLogManager.getLogger(AbstractSMTPService.class);
 
diff --git a/org.eclipse.scout.rt.server/src/org/eclipse/scout/rt/server/services/common/smtp/ISMTPService.java b/org.eclipse.scout.rt.server/src/org/eclipse/scout/rt/server/services/common/smtp/ISMTPService.java
index 973bb94717..d3faa03e43 100644
--- a/org.eclipse.scout.rt.server/src/org/eclipse/scout/rt/server/services/common/smtp/ISMTPService.java
+++ b/org.eclipse.scout.rt.server/src/org/eclipse/scout/rt/server/services/common/smtp/ISMTPService.java
@@ -4,7 +4,7 @@
  * 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:
  *     BSI Business Systems Integration AG - initial API and implementation
  ******************************************************************************/
@@ -33,6 +33,7 @@ import org.eclipse.scout.service.IService;
  * 
  * @see MailUtility
  */
+@SuppressWarnings("restriction")
 public interface ISMTPService extends IService {
 
   /**
diff --git a/org.eclipse.scout.rt.server/src/org/eclipse/scout/rt/server/transaction/internal/ActiveTransactionRegistry.java b/org.eclipse.scout.rt.server/src/org/eclipse/scout/rt/server/transaction/internal/ActiveTransactionRegistry.java
index 38a557448f..630c9a96c0 100644
--- a/org.eclipse.scout.rt.server/src/org/eclipse/scout/rt/server/transaction/internal/ActiveTransactionRegistry.java
+++ b/org.eclipse.scout.rt.server/src/org/eclipse/scout/rt/server/transaction/internal/ActiveTransactionRegistry.java
@@ -35,10 +35,10 @@ public class ActiveTransactionRegistry {
       return null;
     }
     synchronized (session) {
-      SessionState state = (SessionState) session.getAttribute(SESSION_STATE_KEY);
+      SessionState state = (SessionState) session.getData(SESSION_STATE_KEY);
       if (state == null && autoCreate) {
         state = new SessionState();
-        session.setAttribute(SESSION_STATE_KEY, state);
+        session.setData(SESSION_STATE_KEY, state);
       }
       return state;
     }
diff --git a/org.eclipse.scout.rt.shared/src/org/eclipse/scout/rt/shared/servicetunnel/LenientPermissionWrapper.java b/org.eclipse.scout.rt.shared/src/org/eclipse/scout/rt/shared/servicetunnel/LenientPermissionWrapper.java
index 81cca03a0d..e0a6c1cc28 100644
--- a/org.eclipse.scout.rt.shared/src/org/eclipse/scout/rt/shared/servicetunnel/LenientPermissionWrapper.java
+++ b/org.eclipse.scout.rt.shared/src/org/eclipse/scout/rt/shared/servicetunnel/LenientPermissionWrapper.java
@@ -64,12 +64,12 @@ public class LenientPermissionWrapper implements Serializable {
 
   private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
     //no call to defaultReadObject
+    final BundleObjectInputStream bundleIn = (in instanceof BundleObjectInputStream ? (BundleObjectInputStream) in : null);
     try {
       ObjectInputStream.GetField gfields = in.readFields();
       m_className = (String) gfields.get("m_className", (String) null);
       byte[] data = (byte[]) gfields.get("m_permission", (byte[]) null);
       //
-      final BundleObjectInputStream bundleIn = (in instanceof BundleObjectInputStream ? (BundleObjectInputStream) in : null);
       ObjectInputStream localIn = new ObjectInputStream(new ByteArrayInputStream(data)) {
         @Override
         protected Class<?> resolveClass(ObjectStreamClass desc) throws IOException, ClassNotFoundException {
@@ -86,6 +86,11 @@ public class LenientPermissionWrapper implements Serializable {
     catch (Throwable t) {
       LOG.warn("cannot deserialize permission", t);
     }
+    finally {
+      if (bundleIn != null) {
+        bundleIn.close();
+      }
+    }
   }
 
 }
diff --git a/org.eclipse.scout.rt.ui.rap/src/org/eclipse/scout/rt/ui/rap/form/fields/RwtScoutValueFieldComposite.java b/org.eclipse.scout.rt.ui.rap/src/org/eclipse/scout/rt/ui/rap/form/fields/RwtScoutValueFieldComposite.java
index ad8bc1aec8..b93e766c6c 100644
--- a/org.eclipse.scout.rt.ui.rap/src/org/eclipse/scout/rt/ui/rap/form/fields/RwtScoutValueFieldComposite.java
+++ b/org.eclipse.scout.rt.ui.rap/src/org/eclipse/scout/rt/ui/rap/form/fields/RwtScoutValueFieldComposite.java
@@ -46,7 +46,7 @@ public abstract class RwtScoutValueFieldComposite<T extends IValueField<?>> exte
   public void setOnFieldLabelFromScout(String text, String label) {
     if (text == null || text.length() == 0) {
       if (getUiField() != null && getUiField() instanceof StyledText) {
-        Integer length = (Integer) getScoutObject().getCustomProperty(IStringField.PROP_MAX_LENGTH);
+        Integer length = (Integer) getScoutObject().getProperty(IStringField.PROP_MAX_LENGTH);
         if (length != null && label.length() > 0) {
           if (length < label.length()) {
             ((StyledText) getUiField()).setTextLimit(label.length());
@@ -57,7 +57,7 @@ public abstract class RwtScoutValueFieldComposite<T extends IValueField<?>> exte
       }
     }
     else if (getUiField() instanceof Control) {
-      Integer length = (Integer) getScoutObject().getCustomProperty(IStringField.PROP_MAX_LENGTH);
+      Integer length = (Integer) getScoutObject().getProperty(IStringField.PROP_MAX_LENGTH);
       if (length != null) {
         ((TextEx) getUiField()).setTextLimit(length);
       }
diff --git a/org.eclipse.scout.rt.ui.swing/src/org/eclipse/scout/rt/ui/swing/form/fields/mailfield/SwingMailAttachment.java b/org.eclipse.scout.rt.ui.swing/src/org/eclipse/scout/rt/ui/swing/form/fields/mailfield/SwingMailAttachment.java
index b36f2f352e..4fe0b9e9d9 100644
--- a/org.eclipse.scout.rt.ui.swing/src/org/eclipse/scout/rt/ui/swing/form/fields/mailfield/SwingMailAttachment.java
+++ b/org.eclipse.scout.rt.ui.swing/src/org/eclipse/scout/rt/ui/swing/form/fields/mailfield/SwingMailAttachment.java
@@ -4,7 +4,7 @@
  * 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:
  *     BSI Business Systems Integration AG - initial API and implementation
  ******************************************************************************/
@@ -20,6 +20,7 @@ import org.eclipse.scout.commons.IOUtility;
 import org.eclipse.scout.commons.logger.IScoutLogger;
 import org.eclipse.scout.commons.logger.ScoutLogManager;
 
+@SuppressWarnings("restriction")
 public class SwingMailAttachment {
   private static final IScoutLogger LOG = ScoutLogManager.getLogger(SwingMailAttachment.class);
   private Part m_part;
diff --git a/org.eclipse.scout.rt.ui.swing/src/org/eclipse/scout/rt/ui/swing/form/fields/mailfield/SwingMailAttachmentView.java b/org.eclipse.scout.rt.ui.swing/src/org/eclipse/scout/rt/ui/swing/form/fields/mailfield/SwingMailAttachmentView.java
index 056891a0b2..ca810d8ff6 100644
--- a/org.eclipse.scout.rt.ui.swing/src/org/eclipse/scout/rt/ui/swing/form/fields/mailfield/SwingMailAttachmentView.java
+++ b/org.eclipse.scout.rt.ui.swing/src/org/eclipse/scout/rt/ui/swing/form/fields/mailfield/SwingMailAttachmentView.java
@@ -37,6 +37,7 @@ public class SwingMailAttachmentView extends JPanel {
     setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
   }
 
+  @SuppressWarnings("restriction")
   protected void createContent() {
     JLabelEx iconLabel = new JLabelEx();
     sun.awt.shell.ShellFolder shellFolder;
diff --git a/org.eclipse.scout.rt.ui.swing/src/org/eclipse/scout/rt/ui/swing/form/fields/mailfield/SwingScoutMailField.java b/org.eclipse.scout.rt.ui.swing/src/org/eclipse/scout/rt/ui/swing/form/fields/mailfield/SwingScoutMailField.java
index e5f1b82520..70e54e0070 100644
--- a/org.eclipse.scout.rt.ui.swing/src/org/eclipse/scout/rt/ui/swing/form/fields/mailfield/SwingScoutMailField.java
+++ b/org.eclipse.scout.rt.ui.swing/src/org/eclipse/scout/rt/ui/swing/form/fields/mailfield/SwingScoutMailField.java
@@ -78,6 +78,7 @@ import org.eclipse.scout.rt.ui.swing.ext.MouseClickedBugFix;
 import org.eclipse.scout.rt.ui.swing.form.fields.LogicalGridDataBuilder;
 import org.eclipse.scout.rt.ui.swing.form.fields.SwingScoutValueFieldComposite;
 
+@SuppressWarnings("restriction")
 public class SwingScoutMailField extends SwingScoutValueFieldComposite<IMailField> implements ISwingScoutMailField {
   private static final IScoutLogger LOG = ScoutLogManager.getLogger(SwingScoutMailField.class);
   private static final String KEY_FROM = "From";
diff --git a/org.eclipse.scout.service/src/org/eclipse/scout/service/SERVICES.java b/org.eclipse.scout.service/src/org/eclipse/scout/service/SERVICES.java
index c078d02ab8..0152f32e98 100644
--- a/org.eclipse.scout.service/src/org/eclipse/scout/service/SERVICES.java
+++ b/org.eclipse.scout.service/src/org/eclipse/scout/service/SERVICES.java
@@ -184,6 +184,7 @@ public final class SERVICES {
   }
 
   private static Object safeGetService(BundleContext context, ServiceReference ref) {
+    @SuppressWarnings("unchecked")
     Object o = context.getService(ref);
     if (o instanceof INullService) {
       o = null;
diff --git a/org.eclipse.scout.service/src/org/eclipse/scout/service/internal/Activator.java b/org.eclipse.scout.service/src/org/eclipse/scout/service/internal/Activator.java
index 54eb0f17d8..48b270747e 100644
--- a/org.eclipse.scout.service/src/org/eclipse/scout/service/internal/Activator.java
+++ b/org.eclipse.scout.service/src/org/eclipse/scout/service/internal/Activator.java
@@ -4,7 +4,7 @@
  * 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:
  *     BSI Business Systems Integration AG - initial API and implementation
  ******************************************************************************/
@@ -50,6 +50,7 @@ public class Activator extends Plugin {
     super.start(context);
     plugin = this;
     ServiceReference ref = context.getServiceReference(IExtensionRegistry.class.getName());
+    @SuppressWarnings("unchecked")
     IExtensionRegistry reg = (IExtensionRegistry) context.getService(ref);
     context.ungetService(ref);
     m_servicesExtensionManager = new ServicesExtensionManager(reg, PLUGIN_ID + ".services");