[LMS-635] change: - 'AbstractViewContext' renamed to 'AbstractPluginViewContext'.

add: - Log info in 'AbstractServer' constructor.

SVN: 9113

openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/AbstractViewContext.java → openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/AbstractPluginViewContext.java

@@ -17,16 +17,51 @@
 package ch.systemsx.cisd.openbis.generic.client.web.client.application;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.IClientServiceAsync;
+import ch.systemsx.cisd.openbis.generic.client.web.client.ICommonClientServiceAsync;
 
 /**
- * An <i>abstract</i> {@link IViewContext} implementation.
+ * An <i>abstract</i> {@link IViewContext} implementation which should be extended by each plugin
+ * based technology.
  * 
  * @author Christian Ribeaud
  */
-public abstract class AbstractViewContext<T extends IClientServiceAsync> implements IViewContext<T>
+public abstract class AbstractPluginViewContext<T extends IClientServiceAsync> implements
+        IViewContext<T>
 {
-    public final String getMessage(final String key, final Object... parameters)
+    private final IViewContext<ICommonClientServiceAsync> commonViewContext;
+
+    public AbstractPluginViewContext(final IViewContext<ICommonClientServiceAsync> commonViewContext)
+    {
+        this.commonViewContext = commonViewContext;
+    }
+
+    //
+    // IViewContext
+    //
+
+    public final IViewContext<ICommonClientServiceAsync> getCommonViewContext()
+    {
+        return commonViewContext;
+    }
+
+    public final GenericViewModel getModel()
+    {
+        return commonViewContext.getModel();
+    }
+
+    public final IPageController getPageController()
+    {
+        return commonViewContext.getPageController();
+    }
+
+    public final IClientPluginFactoryProvider getClientPluginFactoryProvider()
     {
-        return getMessageProvider().getMessage(key, parameters);
+        return commonViewContext.getClientPluginFactoryProvider();
     }
+
+    public final IGenericImageBundle getImageBundle()
+    {
+        return commonViewContext.getImageBundle();
+    }
+
 }

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

@@ -26,7 +26,7 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.IMess
  * 
  * @author Franz-Josef Elmer
  */
-public final class CommonViewContext extends AbstractViewContext<ICommonClientServiceAsync>
+public final class CommonViewContext implements IViewContext<ICommonClientServiceAsync>
 {
     // We use here 'generic' because we did not split the javascript dictionary yet.
     private static final String TECHNOLOGY_NAME = "generic";

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

@@ -81,10 +81,14 @@ public class TopMenu extends LayoutContainer
         final String fullInfo;
         if (homeGroup == null)
         {
-            fullInfo = viewContext.getMessage("header_userWithoutHomegroup", userName);
+            fullInfo =
+                    viewContext.getMessageProvider().getMessage("header_userWithoutHomegroup",
+                            userName);
         } else
         {
-            fullInfo = viewContext.getMessage("header_userWithHomegroup", userName, homeGroup);
+            fullInfo =
+                    viewContext.getMessageProvider().getMessage("header_userWithHomegroup",
+                            userName, homeGroup);
         }
         final Html html = new Html(fullInfo);
         html.setStyleAttribute("marginRight", "7px");
@@ -93,7 +97,9 @@ public class TopMenu extends LayoutContainer
 
     private final Html createTitleHeader()
     {
-        final Html titleHeader = new Html(viewContext.getMessage("applicationName"));
+
+        final Html titleHeader =
+                new Html(viewContext.getMessageProvider().getMessage("applicationName"));
         titleHeader.setStyleAttribute("margin", "0 1em 0 1em");
         return titleHeader;
     }
@@ -107,7 +113,7 @@ public class TopMenu extends LayoutContainer
 
         LogoutButton(final CommonViewContext viewContext)
         {
-            super(viewContext.getMessage("header_logoutButtonLabel"));
+            super(viewContext.getMessageProvider().getMessage("header_logoutButtonLabel"));
             final SelectionListener<ComponentEvent> listener =
                     new SelectionListener<ComponentEvent>()
                         {

openbis/source/java/ch/systemsx/cisd/openbis/generic/server/AbstractServer.java

@@ -21,11 +21,14 @@ import java.util.List;
 
 import javax.annotation.Resource;
 
+import org.apache.log4j.Logger;
 import org.springframework.aop.framework.ProxyFactory;
 import org.springframework.beans.factory.FactoryBean;
 
 import ch.systemsx.cisd.authentication.ISessionManager;
 import ch.systemsx.cisd.authentication.Principal;
+import ch.systemsx.cisd.common.logging.LogCategory;
+import ch.systemsx.cisd.common.logging.LogFactory;
 import ch.systemsx.cisd.common.spring.IInvocationLoggerFactory;
 import ch.systemsx.cisd.common.spring.LogInterceptor;
 import ch.systemsx.cisd.openbis.generic.server.business.bo.IGenericBusinessObjectFactory;
@@ -47,6 +50,9 @@ import ch.systemsx.cisd.openbis.plugin.generic.shared.ResourceNames;
 public abstract class AbstractServer<T extends IServer> implements IServer,
         IInvocationLoggerFactory<T>, FactoryBean
 {
+    private final static Logger operationLog =
+            LogFactory.getLogger(LogCategory.OPERATION, AbstractServer.class);
+
     @Resource(name = ComponentNames.SESSION_MANAGER)
     private ISessionManager<Session> sessionManager;
 
@@ -63,7 +69,16 @@ public abstract class AbstractServer<T extends IServer> implements IServer,
 
     protected AbstractServer()
     {
-        System.out.println(getClass());
+        operationLog.info(String.format("Creating new '%s' implementation: '%s'.", IServer.class
+                .getSimpleName(), getClass().getName()));
+    }
+
+    protected AbstractServer(final ISessionManager<Session> sessionManager,
+            final IDAOFactory daoFactory, IGenericBusinessObjectFactory boFactory)
+    {
+        this.sessionManager = sessionManager;
+        this.daoFactory = daoFactory;
+        this.businessObjectFactory = boFactory;
     }
 
     private final ProxyFactory getProxyFactory()
@@ -90,14 +105,6 @@ public abstract class AbstractServer<T extends IServer> implements IServer,
         return roleAssignmentPE;
     }
 
-    protected AbstractServer(final ISessionManager<Session> sessionManager,
-            final IDAOFactory daoFactory, IGenericBusinessObjectFactory boFactory)
-    {
-        this.sessionManager = sessionManager;
-        this.daoFactory = daoFactory;
-        this.businessObjectFactory = boFactory;
-    }
-
     protected final PersonPE createPerson(final Principal principal, final PersonPE registrator)
     {
         final PersonPE person = new PersonPE();

openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/GenericViewContext.java

@@ -4,12 +4,8 @@ import com.google.gwt.core.client.GWT;
 import com.google.gwt.user.client.rpc.ServiceDefTarget;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.ICommonClientServiceAsync;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.AbstractViewContext;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.AbstractPluginViewContext;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.GenericConstants;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.GenericViewModel;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.IClientPluginFactoryProvider;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.IGenericImageBundle;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.IPageController;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.CompositeMessageProvider;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.DictonaryBasedMessageProvider;
@@ -22,22 +18,20 @@ import ch.systemsx.cisd.openbis.plugin.generic.client.web.client.IGenericClientS
  * 
  * @author Christian Ribeaud
  */
-public final class GenericViewContext extends AbstractViewContext<IGenericClientServiceAsync>
+public final class GenericViewContext extends AbstractPluginViewContext<IGenericClientServiceAsync>
 {
     private static final String TECHNOLOGY_NAME = "generic";
 
-    private final IViewContext<ICommonClientServiceAsync> commonViewContext;
-
     private final IMessageProvider messageProvider;
 
     private final IGenericClientServiceAsync service;
 
-    public GenericViewContext(final IViewContext<ICommonClientServiceAsync> originalViewContext)
+    public GenericViewContext(final IViewContext<ICommonClientServiceAsync> commonViewContext)
     {
-        this.commonViewContext = originalViewContext;
+        super(commonViewContext);
         this.messageProvider =
                 new CompositeMessageProvider(new DictonaryBasedMessageProvider(TECHNOLOGY_NAME),
-                        originalViewContext.getMessageProvider());
+                        commonViewContext.getMessageProvider());
         this.service = createScreeningClientService();
     }
 
@@ -58,33 +52,8 @@ public final class GenericViewContext extends AbstractViewContext<IGenericClient
         return messageProvider;
     }
 
-    public final IGenericImageBundle getImageBundle()
-    {
-        return commonViewContext.getImageBundle();
-    }
-
-    public final GenericViewModel getModel()
-    {
-        return commonViewContext.getModel();
-    }
-
-    public final IPageController getPageController()
-    {
-        return commonViewContext.getPageController();
-    }
-
     public final IGenericClientServiceAsync getService()
     {
         return service;
     }
-
-    public final IClientPluginFactoryProvider getClientPluginFactoryProvider()
-    {
-        return commonViewContext.getClientPluginFactoryProvider();
-    }
-
-    public final IViewContext<ICommonClientServiceAsync> getCommonViewContext()
-    {
-        return commonViewContext;
-    }
 }
\ No newline at end of file

openbis/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/ScreeningViewContext.java

@@ -4,12 +4,8 @@ import com.google.gwt.core.client.GWT;
 import com.google.gwt.user.client.rpc.ServiceDefTarget;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.ICommonClientServiceAsync;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.AbstractViewContext;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.AbstractPluginViewContext;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.GenericConstants;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.GenericViewModel;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.IClientPluginFactoryProvider;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.IGenericImageBundle;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.IPageController;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.CompositeMessageProvider;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.DictonaryBasedMessageProvider;
@@ -22,22 +18,21 @@ import ch.systemsx.cisd.openbis.plugin.screening.client.web.client.IScreeningCli
  * 
  * @author Christian Ribeaud
  */
-public final class ScreeningViewContext extends AbstractViewContext<IScreeningClientServiceAsync>
+public final class ScreeningViewContext extends
+        AbstractPluginViewContext<IScreeningClientServiceAsync>
 {
     private static final String TECHNOLOGY_NAME = "screening";
 
-    private final IViewContext<ICommonClientServiceAsync> commonViewContext;
-
     private final IMessageProvider messageProvider;
 
     private final IScreeningClientServiceAsync service;
 
-    public ScreeningViewContext(final IViewContext<ICommonClientServiceAsync> originalViewContext)
+    public ScreeningViewContext(final IViewContext<ICommonClientServiceAsync> commonViewContext)
     {
-        this.commonViewContext = originalViewContext;
+        super(commonViewContext);
         this.messageProvider =
                 new CompositeMessageProvider(new DictonaryBasedMessageProvider(TECHNOLOGY_NAME),
-                        originalViewContext.getMessageProvider());
+                        commonViewContext.getMessageProvider());
         this.service = createScreeningClientService();
     }
 
@@ -58,33 +53,8 @@ public final class ScreeningViewContext extends AbstractViewContext<IScreeningCl
         return messageProvider;
     }
 
-    public final IGenericImageBundle getImageBundle()
-    {
-        return commonViewContext.getImageBundle();
-    }
-
-    public final GenericViewModel getModel()
-    {
-        return commonViewContext.getModel();
-    }
-
-    public final IPageController getPageController()
-    {
-        return commonViewContext.getPageController();
-    }
-
     public final IScreeningClientServiceAsync getService()
     {
         return service;
     }
-
-    public final IClientPluginFactoryProvider getClientPluginFactoryProvider()
-    {
-        return commonViewContext.getClientPluginFactoryProvider();
-    }
-
-    public final IViewContext<ICommonClientServiceAsync> getCommonViewContext()
-    {
-        return commonViewContext;
-    }
 }
\ No newline at end of file