[LMS-1884] got rid of openbis compilation & runtime warnings - introduced...

[LMS-1884] got rid of openbis compilation & runtime warnings - introduced ISerializable interface combining IsSerializable and Serializable

SVN: 18945

openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/DisplaySettingsManager.java

@@ -34,6 +34,7 @@ import com.google.gwt.user.client.rpc.IsSerializable;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.CommonViewContext.ClientStaticState;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.IDelegatedAction;
+import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ColumnSetting;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DetailViewConfiguration;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DisplaySettings;
@@ -380,8 +381,7 @@ public class DisplaySettingsManager
 
     /** @deprecated Should be used only by specific display settings manager */
     @Deprecated
-    public final void setTechnologySpecificSettings(String technologyName,
-            IsSerializable newSettings)
+    public final void setTechnologySpecificSettings(String technologyName, ISerializable newSettings)
     {
         displaySettings.getTechnologySpecificSettings().put(technologyName, newSettings);
     }

openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/ISerializable.java

+/*
+ * Copyright 2010 ETH Zuerich, CISD
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ch.systemsx.cisd.openbis.generic.shared.basic;
+
+import java.io.Serializable;
+
+import com.google.gwt.user.client.rpc.IsSerializable;
+
+/**
+ * Marker interface indicating that a type is both {@link Serializable} and {@link IsSerializable}
+ * (can be used as 'basic' DTOs that can be transferred between GWT client and server).
+ * <p>
+ * NOTE: All 'basic' DTO's should implement interface this because of java.io serialization used by
+ * ReflectiveStringEscaper and DisplaySettings.
+ * 
+ * @author Piotr Buczek
+ */
+public interface ISerializable extends IsSerializable, Serializable
+{
+
+}

openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DisplaySettings.java

@@ -23,6 +23,8 @@ import java.util.Map;
 
 import com.google.gwt.user.client.rpc.IsSerializable;
 
+import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
+
 /**
  * Class storing personalised display settings. This class implements {@link Serializable} not only
  * for transferring it's content remotely but also to store it in the database. Thus, CHANGES IN
@@ -42,8 +44,8 @@ public class DisplaySettings implements Serializable, IsSerializable
     private Map<String, List<ColumnSetting>> columnSettings =
             new HashMap<String, List<ColumnSetting>>();
 
-    private Map<String, IsSerializable> technologySpecificSettings =
-            new HashMap<String, IsSerializable>();
+    private Map<String, ISerializable> technologySpecificSettings =
+            new HashMap<String, ISerializable>();
 
     private Map<String, String> tabSettings = new HashMap<String, String>();
 
@@ -64,11 +66,11 @@ public class DisplaySettings implements Serializable, IsSerializable
 
     /** @deprecated Should be used only by DisplaySettingsManager. */
     @Deprecated
-    public Map<String, IsSerializable> getTechnologySpecificSettings()
+    public Map<String, ISerializable> getTechnologySpecificSettings()
     {
         if (technologySpecificSettings == null)
         {
-            technologySpecificSettings = new HashMap<String, IsSerializable>();
+            technologySpecificSettings = new HashMap<String, ISerializable>();
         }
         return technologySpecificSettings;
     }
@@ -149,8 +151,7 @@ public class DisplaySettings implements Serializable, IsSerializable
     // for serialization
 
     @SuppressWarnings("unused")
-    private void setTechnologySpecificSettings(
-            Map<String, IsSerializable> technologySpecificSettings)
+    private void setTechnologySpecificSettings(Map<String, ISerializable> technologySpecificSettings)
     {
         this.technologySpecificSettings = technologySpecificSettings;
     }

screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/ScreeningDisplaySettings.java

@@ -16,18 +16,17 @@
 
 package ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto;
 
-import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.google.gwt.user.client.rpc.IsSerializable;
+import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
 
 /**
  * Screening specific display settings.
  * 
  * @author Piotr Buczek
  */
-public class ScreeningDisplaySettings implements Serializable, IsSerializable
+public class ScreeningDisplaySettings implements ISerializable
 {
     private static final long serialVersionUID = 1L;