diff --git a/src/main/java/org/escidoc/browser/elabsmodul/controller/InvestigationController.java b/src/main/java/org/escidoc/browser/elabsmodul/controller/InvestigationController.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.
@@ -121,7 +121,7 @@ public class InvestigationController extends Controller implements IInvestigatio
     /*
      * (non-Javadoc)
      * 
-     * @see org.escidoc.browser.controller.Controller#init(org.escidoc.browser.model.EscidocServiceLocation,
+     * @see org.escidoc.browser.controller.Controller#init(org.escidoc.browser.model .EscidocServiceLocation,
      * org.escidoc.browser.repository.Repositories, org.escidoc.browser.ui.Router,
      * org.escidoc.browser.model.ResourceProxy, com.vaadin.ui.Window, org.escidoc.browser.model.CurrentUser)
      */
@@ -378,9 +378,8 @@ private List<ResourceModel> createBreadCrumbModel() {
     /*
      * (non-Javadoc)
      * 
-     * @see
-     * org.escidoc.browser.elabsmodul.interfaces.ISaveAction#saveAction(org.escidoc.browser.elabsmodul.interfaces.IBeanModel
-     * )
+     * @see org.escidoc.browser.elabsmodul.interfaces.ISaveAction#saveAction(org.
+     * escidoc.browser.elabsmodul.interfaces.IBeanModel )
      */
     @Override
     public void saveAction(final IBeanModel model) {
@@ -505,8 +504,9 @@ public static Element createInvestigationDOMElementByBeanModel(final Investigati
     @Override
     public boolean hasUpdateAccess() {
         try {
-            return getRepositories().pdp().forCurrentUser().isAction(ActionIdConstants.UPDATE_CONTAINER).forResource(
-                getResourceProxy().getId()).permitted();
+            return getRepositories()
+                .pdp().forCurrentUser().isAction(ActionIdConstants.UPDATE_CONTAINER)
+                .forResource(getResourceProxy().getId()).permitted();
         }
         catch (final UnsupportedOperationException e) {
             showError("Inernal error");

diff --git a/src/main/java/org/escidoc/browser/elabsmodul/controller/InvestigationSeriesController.java b/src/main/java/org/escidoc/browser/elabsmodul/controller/InvestigationSeriesController.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.
@@ -210,7 +210,8 @@ else if ("description".equals(node.getLocalName())
     // @Override
     // protected void createView() {
     // view =
-    // new InvestigationSeriesView((ContainerProxy) getResourceProxy(), this.investigationSeriesBean,
+    // new InvestigationSeriesView((ContainerProxy) getResourceProxy(),
+    // this.investigationSeriesBean,
     // createBreadCrumbModel(), this, getRouter());
     // }
 
@@ -231,8 +232,9 @@ private List<ResourceModel> createBreadCrumbModel() {
     @Override
     public boolean hasUpdateAccess() {
         try {
-            return getRepositories().pdp().forCurrentUser().isAction(ActionIdConstants.UPDATE_CONTAINER).forResource(
-                containerProxy.getId()).permitted();
+            return getRepositories()
+                .pdp().forCurrentUser().isAction(ActionIdConstants.UPDATE_CONTAINER)
+                .forResource(containerProxy.getId()).permitted();
         }
         catch (final UnsupportedOperationException e) {
             showError("Internal error");

diff --git a/src/main/java/org/escidoc/browser/elabsmodul/controller/RigController.java b/src/main/java/org/escidoc/browser/elabsmodul/controller/RigController.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.
@@ -307,8 +307,9 @@ public List<InstrumentBean> getNewAvailableInstruments(final List<String> contai
     @Override
     public boolean hasUpdateAccess() {
         try {
-            return getRepositories().pdp().forCurrentUser().isAction(ActionIdConstants.UPDATE_ITEM).forResource(
-                getResourceProxy().getId()).permitted();
+            return getRepositories()
+                .pdp().forCurrentUser().isAction(ActionIdConstants.UPDATE_ITEM).forResource(getResourceProxy().getId())
+                .permitted();
         }
         catch (final UnsupportedOperationException e) {
             showError("Internal error");

diff --git a/src/main/java/org/escidoc/browser/elabsmodul/controller/StudyController.java b/src/main/java/org/escidoc/browser/elabsmodul/controller/StudyController.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.
@@ -260,8 +260,9 @@ private List<ResourceModel> createBeadCrumbModel() {
     @Override
     public boolean hasUpdateAccess() {
         try {
-            return getRepositories().pdp().forCurrentUser().isAction(ActionIdConstants.UPDATE_CONTAINER).forResource(
-                getResourceProxy().getId()).permitted();
+            return getRepositories()
+                .pdp().forCurrentUser().isAction(ActionIdConstants.UPDATE_CONTAINER)
+                .forResource(getResourceProxy().getId()).permitted();
         }
         catch (UnsupportedOperationException e) {
             showError("Internal error");

diff --git a/src/main/java/org/escidoc/browser/elabsmodul/controller/utils/DOM2String.java b/src/main/java/org/escidoc/browser/elabsmodul/controller/utils/DOM2String.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/elabsmodul/enums/ContentModelTypeEnum.java b/src/main/java/org/escidoc/browser/elabsmodul/enums/ContentModelTypeEnum.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/elabsmodul/enums/ELabsFileFormatsEnum.java b/src/main/java/org/escidoc/browser/elabsmodul/enums/ELabsFileFormatsEnum.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/elabsmodul/exceptions/EscidocBrowserException.java b/src/main/java/org/escidoc/browser/elabsmodul/exceptions/EscidocBrowserException.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/elabsmodul/interfaces/IBeanModel.java b/src/main/java/org/escidoc/browser/elabsmodul/interfaces/IBeanModel.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/elabsmodul/interfaces/IInvestigationAction.java b/src/main/java/org/escidoc/browser/elabsmodul/interfaces/IInvestigationAction.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/elabsmodul/interfaces/ILabsAction.java b/src/main/java/org/escidoc/browser/elabsmodul/interfaces/ILabsAction.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/elabsmodul/interfaces/ILabsInstrumentAction.java b/src/main/java/org/escidoc/browser/elabsmodul/interfaces/ILabsInstrumentAction.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/elabsmodul/interfaces/ILabsInvestigationAction.java b/src/main/java/org/escidoc/browser/elabsmodul/interfaces/ILabsInvestigationAction.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/elabsmodul/interfaces/ILabsPanel.java b/src/main/java/org/escidoc/browser/elabsmodul/interfaces/ILabsPanel.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/elabsmodul/interfaces/ILabsService.java b/src/main/java/org/escidoc/browser/elabsmodul/interfaces/ILabsService.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/elabsmodul/interfaces/IRigAction.java b/src/main/java/org/escidoc/browser/elabsmodul/interfaces/IRigAction.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/elabsmodul/interfaces/ISaveAction.java b/src/main/java/org/escidoc/browser/elabsmodul/interfaces/ISaveAction.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/elabsmodul/model/DurationBean.java b/src/main/java/org/escidoc/browser/elabsmodul/model/DurationBean.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/elabsmodul/model/FileFormatBean.java b/src/main/java/org/escidoc/browser/elabsmodul/model/FileFormatBean.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/elabsmodul/model/InstrumentBean.java b/src/main/java/org/escidoc/browser/elabsmodul/model/InstrumentBean.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/elabsmodul/model/InvestigationBean.java b/src/main/java/org/escidoc/browser/elabsmodul/model/InvestigationBean.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/elabsmodul/model/InvestigationSeriesBean.java b/src/main/java/org/escidoc/browser/elabsmodul/model/InvestigationSeriesBean.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/elabsmodul/model/OrgUnitBean.java b/src/main/java/org/escidoc/browser/elabsmodul/model/OrgUnitBean.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/elabsmodul/model/RigBean.java b/src/main/java/org/escidoc/browser/elabsmodul/model/RigBean.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/elabsmodul/model/StudyBean.java b/src/main/java/org/escidoc/browser/elabsmodul/model/StudyBean.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/elabsmodul/model/UserBean.java b/src/main/java/org/escidoc/browser/elabsmodul/model/UserBean.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/elabsmodul/service/ELabsService.java b/src/main/java/org/escidoc/browser/elabsmodul/service/ELabsService.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.
@@ -309,7 +309,8 @@ private List<Map<String, String>> gatherConfigurationDataFromInfrastructure() th
     private static String createInstrumentNameAndId(final InstrumentBean instrumentBean) {
         // @formatter:off
         return new StringBuilder(instrumentBean.getName())
-            .append(' ').append("(").append(instrumentBean.getObjectId()).append(")").toString();
+            .append(' ').append("(").append(instrumentBean.getObjectId())
+            .append(")").toString();
         // @formatter:on
     }
 
@@ -424,8 +425,9 @@ public synchronized void start() throws EscidocBrowserException {
                 showError("Communication error");
                 throw new EscidocBrowserException();
             }
-            this.router.getApp().getMainWindow().showNotification("Success", "Configuration is sent!",
-                Notification.TYPE_TRAY_NOTIFICATION);
+            this.router
+                .getApp().getMainWindow()
+                .showNotification("Success", "Configuration is sent!", Notification.TYPE_TRAY_NOTIFICATION);
         }
         catch (final EscidocBrowserException e) {
             LOG.error(e.getMessage());
@@ -634,7 +636,7 @@ private void showError(final String errorMessage) {
 
     private void showWarning(final String warningMessage) {
         Preconditions.checkNotNull(warningMessage, "Warningmessage is null");
-        this.router.getApp().getMainWindow().showNotification("Warning", warningMessage,
-            Notification.TYPE_WARNING_MESSAGE);
+        this.router
+            .getApp().getMainWindow().showNotification("Warning", warningMessage, Notification.TYPE_WARNING_MESSAGE);
     }
 }
diff --git a/src/main/java/org/escidoc/browser/elabsmodul/views/AddNewEndpointURIWindow.java b/src/main/java/org/escidoc/browser/elabsmodul/views/AddNewEndpointURIWindow.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/elabsmodul/views/AddNewInstrumentsWindow.java b/src/main/java/org/escidoc/browser/elabsmodul/views/AddNewInstrumentsWindow.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/elabsmodul/views/AddNewStudyPublicationWindow.java b/src/main/java/org/escidoc/browser/elabsmodul/views/AddNewStudyPublicationWindow.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/elabsmodul/views/DatePickerWindow.java b/src/main/java/org/escidoc/browser/elabsmodul/views/DatePickerWindow.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.
@@ -160,8 +160,11 @@ public void textChange(TextChangeEvent event) {
                                 tfDays.setValue(0);
                                 tfDays.setInputPrompt("!");
                                 tfDays.focus();
-                                DatePickerWindow.this.getApplication().getMainWindow().showNotification("Wrong input",
-                                    "Should be between 0 and 14", Notification.TYPE_WARNING_MESSAGE);
+                                DatePickerWindow.this
+                                    .getApplication()
+                                    .getMainWindow()
+                                    .showNotification("Wrong input", "Should be between 0 and 14",
+                                        Notification.TYPE_WARNING_MESSAGE);
                                 lDay.setValue((days == 0 || days == 1) ? "day" : "days");
                             }
                             tfMinutes.commit();
@@ -172,8 +175,9 @@ public void textChange(TextChangeEvent event) {
                     LOG.error(e.getMessage());
                 }
                 catch (NumberFormatException e) {
-                    DatePickerWindow.this.getApplication().getMainWindow().showNotification("Only Number",
-                        "Only numbers are allowed", Notification.TYPE_WARNING_MESSAGE);
+                    DatePickerWindow.this
+                        .getApplication().getMainWindow()
+                        .showNotification("Only Number", "Only numbers are allowed", Notification.TYPE_WARNING_MESSAGE);
                     ((TextField) event.getSource()).setValue(0);
                     ((TextField) event.getSource()).setInputPrompt("!");
                 }
@@ -202,8 +206,11 @@ public void textChange(TextChangeEvent event) {
                                 tfHours.setValue(0);
                                 tfHours.setInputPrompt("!");
                                 tfHours.focus();
-                                DatePickerWindow.this.getApplication().getMainWindow().showNotification("Wrong input",
-                                    "Should be between 0 and 23", Notification.TYPE_WARNING_MESSAGE);
+                                DatePickerWindow.this
+                                    .getApplication()
+                                    .getMainWindow()
+                                    .showNotification("Wrong input", "Should be between 0 and 23",
+                                        Notification.TYPE_WARNING_MESSAGE);
                                 lHour.setValue((hours == 0 || hours == 1) ? "hour" : "hours");
                             }
                             tfMinutes.commit();
@@ -214,8 +221,9 @@ public void textChange(TextChangeEvent event) {
                     LOG.error(e.getMessage());
                 }
                 catch (NumberFormatException e) {
-                    DatePickerWindow.this.getApplication().getMainWindow().showNotification("Only Number",
-                        "Only numbers are allowed", Notification.TYPE_WARNING_MESSAGE);
+                    DatePickerWindow.this
+                        .getApplication().getMainWindow()
+                        .showNotification("Only Number", "Only numbers are allowed", Notification.TYPE_WARNING_MESSAGE);
                     ((TextField) event.getSource()).setValue(0);
                     ((TextField) event.getSource()).setInputPrompt("!");
                 }
@@ -243,8 +251,11 @@ public void textChange(TextChangeEvent event) {
                                 tfMinutes.setValue(0);
                                 tfMinutes.setInputPrompt("!");
                                 tfMinutes.focus();
-                                DatePickerWindow.this.getApplication().getMainWindow().showNotification("Wrong input",
-                                    "Should be between 0 and 59", Notification.TYPE_WARNING_MESSAGE);
+                                DatePickerWindow.this
+                                    .getApplication()
+                                    .getMainWindow()
+                                    .showNotification("Wrong input", "Should be between 0 and 59",
+                                        Notification.TYPE_WARNING_MESSAGE);
                                 lMinutes.setValue((minutes == 0 || minutes == 1) ? "minute" : "minutes");
                             }
                             tfMinutes.commit();
@@ -255,8 +266,9 @@ public void textChange(TextChangeEvent event) {
                     LOG.error(e.getMessage());
                 }
                 catch (NumberFormatException e) {
-                    DatePickerWindow.this.getApplication().getMainWindow().showNotification("Only Number",
-                        "Only numbers are allowed", Notification.TYPE_WARNING_MESSAGE);
+                    DatePickerWindow.this
+                        .getApplication().getMainWindow()
+                        .showNotification("Only Number", "Only numbers are allowed", Notification.TYPE_WARNING_MESSAGE);
                     ((TextField) event.getSource()).setValue(0);
                     ((TextField) event.getSource()).setInputPrompt("!");
                 }
@@ -333,8 +345,11 @@ public void valueChange(ValueChangeEvent event) {
                 Calendar limit = (Calendar) now.clone();
                 limit.add(Calendar.DAY_OF_YEAR, 14);
                 if (selected.before(now) || selected.after(limit)) {
-                    DatePickerWindow.this.getApplication().getMainWindow().showNotification("Wrong date",
-                        "Selected Date must be in the next two weeks from now", Notification.TYPE_WARNING_MESSAGE);
+                    DatePickerWindow.this
+                        .getApplication()
+                        .getMainWindow()
+                        .showNotification("Wrong date", "Selected Date must be in the next two weeks from now",
+                            Notification.TYPE_WARNING_MESSAGE);
                 }
             }
         });
@@ -388,8 +403,10 @@ else if (tfMinutes.getValue() instanceof Integer) {
                 }
             }
             else {
-                this.getApplication().getMainWindow().showNotification("Wrong date",
-                    "Selected Date must be in the next two weeks from now", Notification.TYPE_WARNING_MESSAGE);
+                this.getApplication()
+                    .getMainWindow()
+                    .showNotification("Wrong date", "Selected Date must be in the next two weeks from now",
+                        Notification.TYPE_WARNING_MESSAGE);
             }
         }
 

diff --git a/src/main/java/org/escidoc/browser/elabsmodul/views/InstrumentView.java b/src/main/java/org/escidoc/browser/elabsmodul/views/InstrumentView.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.
@@ -204,8 +204,8 @@ private void buildPanelGUI() {
                 getPojoItem().getItemProperty(ELabsViewContants.P_INSTRUMENT_FOLDER), true);
         HorizontalLayout h7 =
             LabsLayoutHelper.createHorizontalLayoutWithELabsLabelAndLabelData(
-                ELabsViewContants.L_INSTRUMENT_FILE_FORMAT, getPojoItem().getItemProperty(
-                    ELabsViewContants.P_INSTRUMENT_FILEFORMAT), false);
+                ELabsViewContants.L_INSTRUMENT_FILE_FORMAT,
+                getPojoItem().getItemProperty(ELabsViewContants.P_INSTRUMENT_FILEFORMAT), false);
         HorizontalLayout h8 =
             LabsLayoutHelper.createHorizontalLayoutWithELabsLabelAndLabelComplexData(
                 ELabsViewContants.L_INSTRUMENT_DEVICE_SUPERVISOR, supervisorText, false);

diff --git a/src/main/java/org/escidoc/browser/elabsmodul/views/InvestigationSeriesView.java b/src/main/java/org/escidoc/browser/elabsmodul/views/InvestigationSeriesView.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.
@@ -150,8 +150,8 @@ private void buildPanelGUI() {
         this.dynamicLayout.setStyleName(ELabsViewContants.STYLE_ELABS_FORM);
         this.buttonLayout = createButtonLayout();
         HorizontalLayout name =
-            LabsLayoutHelper.createHorizontalLayoutWithELabsLabelAndLabelData(ELabsViewContants.L_TITLE, this.beanItem
-                .getItemProperty("name"), true);
+            LabsLayoutHelper.createHorizontalLayoutWithELabsLabelAndLabelData(ELabsViewContants.L_TITLE,
+                this.beanItem.getItemProperty("name"), true);
         HorizontalLayout description =
             LabsLayoutHelper.createHorizontalLayoutWithELabsLabelAndLabelData(ELabsViewContants.L_DESCRIPTION,
                 this.beanItem.getItemProperty("description"), true);
@@ -243,8 +243,9 @@ private void leftCell() throws EscidocClientException {
         vl.setMargin(false);
         vl.setSizeFull();
         leftPanel.setContent(vl);
-        new DirectMember(this.router.getServiceLocation(), this.router, this.containerProxy.getId(), this.router
-            .getMainWindow(), router.getRepositories(), leftPanel, ResourceType.CONTAINER.toString()).containerAsTree();
+        new DirectMember(this.router.getServiceLocation(), this.router, this.containerProxy.getId(),
+            this.router.getMainWindow(), router.getRepositories(), leftPanel, ResourceType.CONTAINER.toString())
+            .containerAsTree();
         this.directMemberInvSeriesContainer.addComponent(leftPanel);
         this.directMemberInvSeriesContainer.setExpandRatio(leftPanel, 3.0f);
     }

diff --git a/src/main/java/org/escidoc/browser/elabsmodul/views/InvestigationView.java b/src/main/java/org/escidoc/browser/elabsmodul/views/InvestigationView.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.
@@ -153,8 +153,8 @@ private void leftCell() throws EscidocClientException {
         vl.setMargin(false);
         vl.setSizeFull();
         leftPanel.setContent(vl);
-        new DirectMember(this.router.getServiceLocation(), this.router, containerProxy.getId(), this.router
-            .getMainWindow(), this.router.getRepositories(), leftPanel, ResourceType.CONTAINER.toString())
+        new DirectMember(this.router.getServiceLocation(), this.router, containerProxy.getId(),
+            this.router.getMainWindow(), this.router.getRepositories(), leftPanel, ResourceType.CONTAINER.toString())
             .containerAsTree();
         directMemberInvestigationContainer.addComponent(leftPanel);
         directMemberInvestigationContainer.setExpandRatio(leftPanel, 3.0f);
@@ -280,8 +280,8 @@ private void buildPanelGUI() {
         this.dynamicLayout.setStyleName(ELabsViewContants.STYLE_ELABS_FORM);
         this.buttonLayout = LabsLayoutHelper.createButtonLayout();
         final HorizontalLayout h1 =
-            LabsLayoutHelper.createHorizontalLayoutWithELabsLabelAndLabelData(ELabsViewContants.L_TITLE, this.pojoItem
-                .getItemProperty(ELabsViewContants.P_INVESTIGATION_TITLE), true);
+            LabsLayoutHelper.createHorizontalLayoutWithELabsLabelAndLabelData(ELabsViewContants.L_TITLE,
+                this.pojoItem.getItemProperty(ELabsViewContants.P_INVESTIGATION_TITLE), true);
         final HorizontalLayout h2 =
             LabsLayoutHelper.createHorizontalLayoutWithELabsLabelAndLabelData(ELabsViewContants.L_DESCRIPTION,
                 this.pojoItem.getItemProperty(ELabsViewContants.P_INVESTIGATION_DESC), true);
@@ -293,8 +293,8 @@ private void buildPanelGUI() {
                 ELabsViewContants.L_INVESTIGATION_INVESTIGATOR, investigatorText, false);
         final HorizontalLayout h5 =
             LabsLayoutHelper.createHorizontalLayoutWithELabsLabelAndLabelData(
-                ELabsViewContants.L_INVESTIGATION_DURATION, this.pojoItem
-                    .getItemProperty(ELabsViewContants.P_INVESTIGATION_DURATION), true);
+                ELabsViewContants.L_INVESTIGATION_DURATION,
+                this.pojoItem.getItemProperty(ELabsViewContants.P_INVESTIGATION_DURATION), true);
         final HorizontalLayout h6 =
             LabsLayoutHelper.createHorizontalLayoutWithELabsLabelAndLabelData(ELabsViewContants.L_INVESTIGATION_RIG,
                 this.pojoItem.getItemProperty(ELabsViewContants.P_INVESTIGATION_RIG), true);

diff --git a/src/main/java/org/escidoc/browser/elabsmodul/views/RigView.java b/src/main/java/org/escidoc/browser/elabsmodul/views/RigView.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.
@@ -154,8 +154,8 @@ private void buildPanelGUI() {
 
         this.buttonLayout = LabsLayoutHelper.createButtonLayout();
         HorizontalLayout h1 =
-            LabsLayoutHelper.createHorizontalLayoutWithELabsLabelAndLabelData(ELabsViewContants.L_TITLE, pojoItem
-                .getItemProperty(ELabsViewContants.P_RIG_TITLE), true);
+            LabsLayoutHelper.createHorizontalLayoutWithELabsLabelAndLabelData(ELabsViewContants.L_TITLE,
+                pojoItem.getItemProperty(ELabsViewContants.P_RIG_TITLE), true);
         HorizontalLayout h2 =
             LabsLayoutHelper.createHorizontalLayoutWithELabsLabelAndLabelData(ELabsViewContants.L_DESCRIPTION,
                 getPojoItem().getItemProperty(ELabsViewContants.P_RIG_DESC), true);

diff --git a/src/main/java/org/escidoc/browser/elabsmodul/views/StudyView.java b/src/main/java/org/escidoc/browser/elabsmodul/views/StudyView.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.
@@ -278,8 +278,8 @@ private void leftCell() throws EscidocClientException {
         vlLeftPanel.setSizeFull();
         vlLeftPanel.setMargin(false);
         leftPanel.setContent(vlLeftPanel);
-        new DirectMember(this.router.getServiceLocation(), this.router, this.containerProxy.getId(), this.router
-            .getMainWindow(), this.router.getRepositories(), leftPanel, ResourceType.CONTAINER.toString())
+        new DirectMember(this.router.getServiceLocation(), this.router, this.containerProxy.getId(),
+            this.router.getMainWindow(), this.router.getRepositories(), leftPanel, ResourceType.CONTAINER.toString())
             .containerAsTree();
         this.directMemberExperimentContainer.addComponent(leftPanel);
         this.directMemberExperimentContainer.setExpandRatio(leftPanel, 3.0f);
@@ -289,8 +289,8 @@ private void leftCell() throws EscidocClientException {
      * Build the read-only layout of the eLabsElement
      */
     private void buildPropertiesGUI() {
-        addComponent(new ResourcePropertiesViewHelper(this.containerProxy, this.breadCrumbModel, "Study", this.router
-            .getServiceLocation()).generatePropertiesView());
+        addComponent(new ResourcePropertiesViewHelper(this.containerProxy, this.breadCrumbModel, "Study",
+            this.router.getServiceLocation()).generatePropertiesView());
     }
 
     @Override

diff --git a/src/main/java/org/escidoc/browser/elabsmodul/views/YesNoDialog.java b/src/main/java/org/escidoc/browser/elabsmodul/views/YesNoDialog.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/elabsmodul/views/helpers/LabsLayoutHelper.java b/src/main/java/org/escidoc/browser/elabsmodul/views/helpers/LabsLayoutHelper.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/elabsmodul/views/helpers/LabsRigTableHelper.java b/src/main/java/org/escidoc/browser/elabsmodul/views/helpers/LabsRigTableHelper.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.
@@ -103,7 +103,10 @@ public VerticalLayout createTableLayoutForRig(final RigBean rigBean, final IRigA
         this.rigTable.setColumnCollapsingAllowed(false);
         this.rigTable.setRowHeaderMode(Table.ROW_HEADER_MODE_HIDDEN);
         this.rigTable.setContainerDataSource(fillRigTableData(rigBean.getContentList()));
-        this.rigTable.setColumnHeaders(new String[] { "Name", "Id" }); // put these into ELabsViewContants
+        this.rigTable.setColumnHeaders(new String[] { "Name", "Id" }); // put
+                                                                       // these
+                                                                       // into
+                                                                       // ELabsViewContants
         this.rigTable.addListener(new Table.ValueChangeListener() {
             private static final long serialVersionUID = 2000562132182698589L;
 
@@ -163,31 +166,35 @@ public void buttonClick(final ClickEvent event) {
                     rigTable.requestRepaint();
                 }
                 else if (event.getButton().getCaption().equals(ADD_BUTTON)) {
-                    rigTable.getApplication().getMainWindow().addWindow(
-                        new AddNewInstrumentsWindow(rigBean, controller, new AddNewInstrumentsWindow.Callback() {
-                            @Override
-                            public void onAcceptRigAction(
-                                final List<InstrumentBean> assignableInstruments,
-                                final Set<String> instrumentIdentifiers) {
-                                if (assignableInstruments == null || assignableInstruments.isEmpty()) {
-                                    return;
-                                }
-                                if (instrumentIdentifiers == null || instrumentIdentifiers.isEmpty()) {
-                                    return;
-                                }
-                                for (Iterator<String> iterator = instrumentIdentifiers.iterator(); iterator.hasNext();) {
-                                    final String id = iterator.next();
-                                    for (Iterator<InstrumentBean> iterator2 = assignableInstruments.iterator(); iterator2
+                    rigTable
+                        .getApplication()
+                        .getMainWindow()
+                        .addWindow(
+                            new AddNewInstrumentsWindow(rigBean, controller, new AddNewInstrumentsWindow.Callback() {
+                                @Override
+                                public void onAcceptRigAction(
+                                    final List<InstrumentBean> assignableInstruments,
+                                    final Set<String> instrumentIdentifiers) {
+                                    if (assignableInstruments == null || assignableInstruments.isEmpty()) {
+                                        return;
+                                    }
+                                    if (instrumentIdentifiers == null || instrumentIdentifiers.isEmpty()) {
+                                        return;
+                                    }
+                                    for (Iterator<String> iterator = instrumentIdentifiers.iterator(); iterator
                                         .hasNext();) {
-                                        InstrumentBean instrumentBean = iterator2.next();
-                                        if (instrumentBean.getObjectId().equals(id)) {
-                                            LabsRigTableHelper.this.rigBean.getContentList().add(instrumentBean);
-                                            LabsRigTableHelper.this.addnewItemToRigTable(instrumentBean);
+                                        final String id = iterator.next();
+                                        for (Iterator<InstrumentBean> iterator2 = assignableInstruments.iterator(); iterator2
+                                            .hasNext();) {
+                                            InstrumentBean instrumentBean = iterator2.next();
+                                            if (instrumentBean.getObjectId().equals(id)) {
+                                                LabsRigTableHelper.this.rigBean.getContentList().add(instrumentBean);
+                                                LabsRigTableHelper.this.addnewItemToRigTable(instrumentBean);
+                                            }
                                         }
                                     }
                                 }
-                            }
-                        }));
+                            }));
                 }
             }
         };

diff --git a/src/main/java/org/escidoc/browser/elabsmodul/views/helpers/LabsStudyTableHelper.java b/src/main/java/org/escidoc/browser/elabsmodul/views/helpers/LabsStudyTableHelper.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.
@@ -158,7 +158,8 @@ public void buttonClick(final ClickEvent event) {
                     LabsStudyTableHelper.this.labsAction.showButtonLayout();
                     @SuppressWarnings("unchecked")
                     Set<String> selectedIdSet = (Set<String>) motPubTable.getValue();
-                    // delete motivationg publication relations from the model
+                    // delete motivationg publication relations from the
+                    // model
                     LabsStudyTableHelper.this.synchronizeStudyModel(selectedIdSet, true);
                     // instant delete from table containerdatasource
                     for (String idToDelete : selectedIdSet) {
@@ -168,8 +169,9 @@ public void buttonClick(final ClickEvent event) {
                 }
                 else if (event.getButton().getCaption().equals(ADD_BUTTON)) {
                     LabsStudyTableHelper.this.labsAction.showButtonLayout();
-                    motPubTable.getApplication().getMainWindow().addWindow(
-                        new AddNewStudyPublicationWindow(new AddNewStudyPublicationWindow.Callback() {
+                    motPubTable
+                        .getApplication().getMainWindow()
+                        .addWindow(new AddNewStudyPublicationWindow(new AddNewStudyPublicationWindow.Callback() {
                             @Override
                             public void onAcceptAction(String inputURLText) {
                                 // add to table
@@ -274,7 +276,8 @@ public void buttonClick(final ClickEvent event) {
                     LabsStudyTableHelper.this.labsAction.showButtonLayout();
                     @SuppressWarnings("unchecked")
                     Set<String> selectedIdSet = (Set<String>) resPubTable.getValue();
-                    // delete motivationg publication relations from the model
+                    // delete motivationg publication relations from the
+                    // model
                     LabsStudyTableHelper.this.synchronizeStudyModel(selectedIdSet, false);
                     // instant delete from table containerdatasource
                     for (String idToDelete : selectedIdSet) {
@@ -284,8 +287,9 @@ public void buttonClick(final ClickEvent event) {
                 }
                 else if (event.getButton().getCaption().equals(ADD_BUTTON)) {
                     LabsStudyTableHelper.this.labsAction.showButtonLayout();
-                    resPubTable.getApplication().getMainWindow().addWindow(
-                        new AddNewStudyPublicationWindow(new AddNewStudyPublicationWindow.Callback() {
+                    resPubTable
+                        .getApplication().getMainWindow()
+                        .addWindow(new AddNewStudyPublicationWindow(new AddNewStudyPublicationWindow.Callback() {
                             @Override
                             public void onAcceptAction(String inputURLText) {
                                 // add to table

diff --git a/src/main/java/org/escidoc/browser/elabsmodul/views/helpers/ResourcePropertiesViewHelper.java b/src/main/java/org/escidoc/browser/elabsmodul/views/helpers/ResourcePropertiesViewHelper.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/elabsmodul/views/helpers/StartInvestigationViewHelper.java b/src/main/java/org/escidoc/browser/elabsmodul/views/helpers/StartInvestigationViewHelper.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.
@@ -70,43 +70,59 @@ public void createStartButton(Panel panel) {
             @Override
             public void buttonClick(final ClickEvent event) {
                 if (event.getButton().getCaption().equals(ELabsViewContants.BTN_START)) {
-                    labsPanel.getReference().getApplication().getMainWindow().addWindow(
-                        new YesNoDialog("Start investigation", "Really want to start the investigation?",
-                            new YesNoDialog.Callback() {
-                                @Override
-                                public void onDialogResult(boolean resultIsYes) {
-                                    if (resultIsYes) {
-                                        try {
-                                            investigationAction.getLabsService().start();
-                                            event.getButton().setCaption(ELabsViewContants.BTN_STOP);
-                                            labsPanel
-                                                .getReference().getApplication().getMainWindow().getWindow()
-                                                .showNotification("Starting", "Starting process...",
-                                                    Notification.TYPE_TRAY_NOTIFICATION);
-                                        }
-                                        catch (EscidocBrowserException e) {
-                                            event.getButton().setCaption(ELabsViewContants.BTN_START);
-                                            labsPanel
-                                                .getReference().getApplication().getMainWindow().getWindow()
-                                                .showNotification("Problem", "Starting process... cancelled",
-                                                    Notification.TYPE_TRAY_NOTIFICATION);
+                    labsPanel
+                        .getReference()
+                        .getApplication()
+                        .getMainWindow()
+                        .addWindow(
+                            new YesNoDialog("Start investigation", "Really want to start the investigation?",
+                                new YesNoDialog.Callback() {
+                                    @Override
+                                    public void onDialogResult(boolean resultIsYes) {
+                                        if (resultIsYes) {
+                                            try {
+                                                investigationAction.getLabsService().start();
+                                                event.getButton().setCaption(ELabsViewContants.BTN_STOP);
+                                                labsPanel
+                                                    .getReference()
+                                                    .getApplication()
+                                                    .getMainWindow()
+                                                    .getWindow()
+                                                    .showNotification("Starting", "Starting process...",
+                                                        Notification.TYPE_TRAY_NOTIFICATION);
+                                            }
+                                            catch (EscidocBrowserException e) {
+                                                event.getButton().setCaption(ELabsViewContants.BTN_START);
+                                                labsPanel
+                                                    .getReference()
+                                                    .getApplication()
+                                                    .getMainWindow()
+                                                    .getWindow()
+                                                    .showNotification("Problem", "Starting process... cancelled",
+                                                        Notification.TYPE_TRAY_NOTIFICATION);
+                                            }
                                         }
                                     }
-                                }
-                            }));
+                                }));
                 }
                 else if (event.getButton().getCaption().equals(ELabsViewContants.BTN_STOP)) {
 
                     try {
                         investigationAction.getLabsService().stop();
                         event.getButton().setCaption(ELabsViewContants.BTN_START);
-                        labsPanel.getReference().getApplication().getMainWindow().getWindow().showNotification(
-                            "Stopping", "Halting process...", Notification.TYPE_TRAY_NOTIFICATION);
+                        labsPanel
+                            .getReference().getApplication().getMainWindow().getWindow()
+                            .showNotification("Stopping", "Halting process...", Notification.TYPE_TRAY_NOTIFICATION);
                     }
                     catch (EscidocBrowserException e) {
                         event.getButton().setCaption(ELabsViewContants.BTN_STOP);
-                        labsPanel.getReference().getApplication().getMainWindow().getWindow().showNotification(
-                            "Problem", "Halting process... cancelled", Notification.TYPE_TRAY_NOTIFICATION);
+                        labsPanel
+                            .getReference()
+                            .getApplication()
+                            .getMainWindow()
+                            .getWindow()
+                            .showNotification("Problem", "Halting process... cancelled",
+                                Notification.TYPE_TRAY_NOTIFICATION);
                     }
                 }
                 else {

diff --git a/...rg/escidoc/browser/elabsmodul/views/listeners/DepositEndpointSelectionLayoutListener.java b/...rg/escidoc/browser/elabsmodul/views/listeners/DepositEndpointSelectionLayoutListener.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.
@@ -117,7 +117,10 @@ public void layoutClick(LayoutClickEvent event) {
                             public void valueChange(ValueChangeEvent event) {
                                 if (event.getProperty().getValue().equals(addNewItemProperty) && addOnWindow == null) {
                                     DepositEndpointSelectionLayoutListener.this.labsPanel
-                                        .getReference().getApplication().getMainWindow().addWindow(
+                                        .getReference()
+                                        .getApplication()
+                                        .getMainWindow()
+                                        .addWindow(
                                             addOnWindow =
                                                 new AddNewEndpointURIWindow(new AddNewEndpointURIWindow.Callback() {
                                                     @Override

diff --git a/...java/org/escidoc/browser/elabsmodul/views/listeners/DepositorSelectionLayoutListener.java b/...java/org/escidoc/browser/elabsmodul/views/listeners/DepositorSelectionLayoutListener.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/...g/escidoc/browser/elabsmodul/views/listeners/DeviceSupervisorSelectionLayoutListener.java b/...g/escidoc/browser/elabsmodul/views/listeners/DeviceSupervisorSelectionLayoutListener.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/.../java/org/escidoc/browser/elabsmodul/views/listeners/DurationSelectionLayoutListener.java b/.../java/org/escidoc/browser/elabsmodul/views/listeners/DurationSelectionLayoutListener.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.
@@ -72,8 +72,9 @@ public void layoutClick(LayoutClickEvent event) {
             if ((dataComponent = ((HorizontalLayout) component).getComponent(1)) == null) {
                 return;
             }
-            this.labsPanel.getReference().getApplication().getMainWindow().addWindow(
-                new DatePickerWindow("Add investigation duration", new DatePickerWindow.Callback() {
+            this.labsPanel
+                .getReference().getApplication().getMainWindow()
+                .addWindow(new DatePickerWindow("Add investigation duration", new DatePickerWindow.Callback() {
 
                     @Override
                     public void onDialogResult(boolean resultIsOk, final DurationBean durationBean) {

diff --git a/...scidoc/browser/elabsmodul/views/listeners/ESyncDaemonEndpointSelectionLayoutListener.java b/...scidoc/browser/elabsmodul/views/listeners/ESyncDaemonEndpointSelectionLayoutListener.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.
@@ -118,7 +118,10 @@ public void layoutClick(LayoutClickEvent event) {
                             public void valueChange(ValueChangeEvent event) {
                                 if (event.getProperty().getValue().equals(addNewItemProperty) && addOnWindow == null) {
                                     ESyncDaemonEndpointSelectionLayoutListener.this.labsPanel
-                                        .getReference().getApplication().getMainWindow().addWindow(
+                                        .getReference()
+                                        .getApplication()
+                                        .getMainWindow()
+                                        .addWindow(
                                             addOnWindow =
                                                 new AddNewEndpointURIWindow(new AddNewEndpointURIWindow.Callback() {
                                                     @Override

diff --git a/...ava/org/escidoc/browser/elabsmodul/views/listeners/FileFormatSelectionLayoutListener.java b/...ava/org/escidoc/browser/elabsmodul/views/listeners/FileFormatSelectionLayoutListener.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/...java/org/escidoc/browser/elabsmodul/views/listeners/InstituteSelectionLayoutListener.java b/...java/org/escidoc/browser/elabsmodul/views/listeners/InstituteSelectionLayoutListener.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/elabsmodul/views/listeners/LabsClientViewEventHandler.java b/src/main/java/org/escidoc/browser/elabsmodul/views/listeners/LabsClientViewEventHandler.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/elabsmodul/views/listeners/RigSelectionLayoutListener.java b/src/main/java/org/escidoc/browser/elabsmodul/views/listeners/RigSelectionLayoutListener.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/layout/CreateGroupView.java b/src/main/java/org/escidoc/browser/layout/CreateGroupView.java
@@ -1,3 +1,31 @@
+/**
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at license/ESCIDOC.LICENSE
+ * or https://www.escidoc.org/license/ESCIDOC.LICENSE .
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at license/ESCIDOC.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ *
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
+ * fuer wissenschaftlich-technische Information mbH and Max-Planck-
+ * Gesellschaft zur Foerderung der Wissenschaft e.V.
+ * All rights reserved.  Use is subject to license terms.
+ */
 package org.escidoc.browser.layout;
 
 import com.google.common.base.Preconditions;

diff --git a/src/main/java/org/escidoc/browser/layout/LayoutDesign.java b/src/main/java/org/escidoc/browser/layout/LayoutDesign.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/layout/OnNavigationTabChange.java b/src/main/java/org/escidoc/browser/layout/OnNavigationTabChange.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/layout/SimpleLayout.java b/src/main/java/org/escidoc/browser/layout/SimpleLayout.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.
@@ -391,7 +391,8 @@ private void showCreateGroupView() {
 
             @Override
             public void textChange(TextChangeEvent event) {
-                // TODO refactor this, the list should not return the data source
+                // TODO refactor this, the list should not return the data
+                // source
                 Filterable ds = (Filterable) list.getDataSource();
                 ds.removeAllContainerFilters();
                 filter = new SimpleStringFilter(PropertyId.NAME, event.getText(), true, false);
@@ -439,7 +440,8 @@ private VerticalLayout buildListWithFilter(final BaseNavigationTreeView list) {
 
             @Override
             public void textChange(TextChangeEvent event) {
-                // TODO refactor this, the list should not return the data source
+                // TODO refactor this, the list should not return the data
+                // source
                 Filterable ds = (Filterable) list.getDataSource();
                 ds.removeAllContainerFilters();
                 filter = new SimpleStringFilter(PropertyId.NAME, event.getText(), true, false);

diff --git a/src/main/java/org/escidoc/browser/layout/UserView.java b/src/main/java/org/escidoc/browser/layout/UserView.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/model/AbstractResourceModel.java b/src/main/java/org/escidoc/browser/model/AbstractResourceModel.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/model/ContainerProxy.java b/src/main/java/org/escidoc/browser/model/ContainerProxy.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/model/ContentModelService.java b/src/main/java/org/escidoc/browser/model/ContentModelService.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.
@@ -88,12 +88,14 @@ ContentModelHandlerClient getClient() {
         return client;
     }
 
-    // Collection<? extends Resource> findPublicOrReleasedResources() throws EscidocException, InternalClientException,
+    // Collection<? extends Resource> findPublicOrReleasedResources() throws
+    // EscidocException, InternalClientException,
     // TransportException {
     // return getClient().retrieveContentModelsAsList(withEmptyFilter());
     // }
 
-    // public Collection<? extends Resource> filterUsingInput(final String query) throws EscidocException,
+    // public Collection<? extends Resource> filterUsingInput(final String
+    // query) throws EscidocException,
     // InternalClientException, TransportException {
     // return getClient().retrieveContentModelsAsList(userInputToFilter(query));
     // }

diff --git a/src/main/java/org/escidoc/browser/model/ContentResourceProxy.java b/src/main/java/org/escidoc/browser/model/ContentResourceProxy.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/model/CurrentUser.java b/src/main/java/org/escidoc/browser/model/CurrentUser.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/model/EscidocServiceLocation.java b/src/main/java/org/escidoc/browser/model/EscidocServiceLocation.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/model/GroupModel.java b/src/main/java/org/escidoc/browser/model/GroupModel.java
@@ -1,3 +1,31 @@
+/**
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at license/ESCIDOC.LICENSE
+ * or https://www.escidoc.org/license/ESCIDOC.LICENSE .
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at license/ESCIDOC.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ *
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
+ * fuer wissenschaftlich-technische Information mbH and Max-Planck-
+ * Gesellschaft zur Foerderung der Wissenschaft e.V.
+ * All rights reserved.  Use is subject to license terms.
+ */
 package org.escidoc.browser.model;
 
 import de.escidoc.core.resources.Resource;

diff --git a/src/main/java/org/escidoc/browser/model/ItemProxy.java b/src/main/java/org/escidoc/browser/model/ItemProxy.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/model/ModelConverter.java b/src/main/java/org/escidoc/browser/model/ModelConverter.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/model/PropertyId.java b/src/main/java/org/escidoc/browser/model/PropertyId.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/model/ResourceModel.java b/src/main/java/org/escidoc/browser/model/ResourceModel.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/model/ResourceModelFactory.java b/src/main/java/org/escidoc/browser/model/ResourceModelFactory.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/model/ResourceProxy.java b/src/main/java/org/escidoc/browser/model/ResourceProxy.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/model/ResourceType.java b/src/main/java/org/escidoc/browser/model/ResourceType.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.
@@ -36,8 +36,8 @@
 public enum ResourceType {
 
     CONTEXT("Context"), CONTAINER("Container"), ITEM("Item"), CONTENT_MODEL("Content Model"), ORG_UNIT(
-        "Organizational Unit"), USER_ACCOUNT("User Account"), ROLE("Role"), CONTENT_RELATION("Content Relation"), 
-        USER_GROUP("User Group"), COMPONENT("Component");
+        "Organizational Unit"), USER_ACCOUNT("User Account"), ROLE("Role"), CONTENT_RELATION("Content Relation"), USER_GROUP(
+        "User Group"), COMPONENT("Component");
 
     @SuppressWarnings("serial")
     private static final Map<de.escidoc.core.resources.ResourceType, ResourceType> map =

diff --git a/src/main/java/org/escidoc/browser/model/TreeDataSource.java b/src/main/java/org/escidoc/browser/model/TreeDataSource.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/model/UserModel.java b/src/main/java/org/escidoc/browser/model/UserModel.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/model/internal/ComponentBuilder.java b/src/main/java/org/escidoc/browser/model/internal/ComponentBuilder.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/model/internal/ComponentVisibility.java b/src/main/java/org/escidoc/browser/model/internal/ComponentVisibility.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/model/internal/ContainerBuilder.java b/src/main/java/org/escidoc/browser/model/internal/ContainerBuilder.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/model/internal/ContainerModel.java b/src/main/java/org/escidoc/browser/model/internal/ContainerModel.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/model/internal/ContainerProxyImpl.java b/src/main/java/org/escidoc/browser/model/internal/ContainerProxyImpl.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/model/internal/ContentModelProxyImpl.java b/src/main/java/org/escidoc/browser/model/internal/ContentModelProxyImpl.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/model/internal/ContextModel.java b/src/main/java/org/escidoc/browser/model/internal/ContextModel.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/model/internal/ContextProxyImpl.java b/src/main/java/org/escidoc/browser/model/internal/ContextProxyImpl.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/model/internal/EscidocServiceLocationImpl.java b/src/main/java/org/escidoc/browser/model/internal/EscidocServiceLocationImpl.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/model/internal/GuestUser.java b/src/main/java/org/escidoc/browser/model/internal/GuestUser.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/model/internal/HasNoNameResource.java b/src/main/java/org/escidoc/browser/model/internal/HasNoNameResource.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/model/internal/HasNoNameResourceImpl.java b/src/main/java/org/escidoc/browser/model/internal/HasNoNameResourceImpl.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/model/internal/ItemBuilder.java b/src/main/java/org/escidoc/browser/model/internal/ItemBuilder.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/model/internal/ItemModel.java b/src/main/java/org/escidoc/browser/model/internal/ItemModel.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/model/internal/ItemProxyImpl.java b/src/main/java/org/escidoc/browser/model/internal/ItemProxyImpl.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/model/internal/LoggedInUser.java b/src/main/java/org/escidoc/browser/model/internal/LoggedInUser.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/model/internal/OrgUnitBuilder.java b/src/main/java/org/escidoc/browser/model/internal/OrgUnitBuilder.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/model/internal/OrgUnitModel.java b/src/main/java/org/escidoc/browser/model/internal/OrgUnitModel.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/model/internal/ResourceDisplay.java b/src/main/java/org/escidoc/browser/model/internal/ResourceDisplay.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/model/internal/TreeDataSourceImpl.java b/src/main/java/org/escidoc/browser/model/internal/TreeDataSourceImpl.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/model/internal/UserProxy.java b/src/main/java/org/escidoc/browser/model/internal/UserProxy.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/repository/AdminRepository.java b/src/main/java/org/escidoc/browser/repository/AdminRepository.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/repository/BaseRepository.java b/src/main/java/org/escidoc/browser/repository/BaseRepository.java
@@ -1,3 +1,31 @@
+/**
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at license/ESCIDOC.LICENSE
+ * or https://www.escidoc.org/license/ESCIDOC.LICENSE .
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at license/ESCIDOC.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ *
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
+ * fuer wissenschaftlich-technische Information mbH and Max-Planck-
+ * Gesellschaft zur Foerderung der Wissenschaft e.V.
+ * All rights reserved.  Use is subject to license terms.
+ */
 package org.escidoc.browser.repository;
 
 import org.escidoc.browser.model.ResourceModel;

diff --git a/src/main/java/org/escidoc/browser/repository/BulkRepository.java b/src/main/java/org/escidoc/browser/repository/BulkRepository.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/repository/GroupRepository.java b/src/main/java/org/escidoc/browser/repository/GroupRepository.java
@@ -1,3 +1,31 @@
+/**
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at license/ESCIDOC.LICENSE
+ * or https://www.escidoc.org/license/ESCIDOC.LICENSE .
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at license/ESCIDOC.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ *
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
+ * fuer wissenschaftlich-technische Information mbH and Max-Planck-
+ * Gesellschaft zur Foerderung der Wissenschaft e.V.
+ * All rights reserved.  Use is subject to license terms.
+ */
 package org.escidoc.browser.repository;
 
 import com.google.common.base.Preconditions;

diff --git a/src/main/java/org/escidoc/browser/repository/IngestRepository.java b/src/main/java/org/escidoc/browser/repository/IngestRepository.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/repository/PdpRepository.java b/src/main/java/org/escidoc/browser/repository/PdpRepository.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/repository/Repositories.java b/src/main/java/org/escidoc/browser/repository/Repositories.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.
@@ -68,6 +68,6 @@ public interface Repositories {
     Repository findByType(ResourceType type);
 
     GroupRepository group();
-    
+
     RoleRepository role();
 }
diff --git a/src/main/java/org/escidoc/browser/repository/Repository.java b/src/main/java/org/escidoc/browser/repository/Repository.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/repository/RoleRepository.java b/src/main/java/org/escidoc/browser/repository/RoleRepository.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/repository/StagingRepository.java b/src/main/java/org/escidoc/browser/repository/StagingRepository.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/repository/UserGroupModel.java b/src/main/java/org/escidoc/browser/repository/UserGroupModel.java
@@ -1,3 +1,31 @@
+/**
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at license/ESCIDOC.LICENSE
+ * or https://www.escidoc.org/license/ESCIDOC.LICENSE .
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at license/ESCIDOC.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ *
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
+ * fuer wissenschaftlich-technische Information mbH and Max-Planck-
+ * Gesellschaft zur Foerderung der Wissenschaft e.V.
+ * All rights reserved.  Use is subject to license terms.
+ */
 package org.escidoc.browser.repository;
 
 import org.escidoc.browser.model.AbstractResourceModel;

diff --git a/src/main/java/org/escidoc/browser/repository/UserRepository.java b/src/main/java/org/escidoc/browser/repository/UserRepository.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/repository/UtilRepository.java b/src/main/java/org/escidoc/browser/repository/UtilRepository.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/repository/internal/ActionIdConstants.java b/src/main/java/org/escidoc/browser/repository/internal/ActionIdConstants.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/repository/internal/ContainerRepository.java b/src/main/java/org/escidoc/browser/repository/internal/ContainerRepository.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/repository/internal/ContentModelRepository.java b/src/main/java/org/escidoc/browser/repository/internal/ContentModelRepository.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/repository/internal/ContextBuilder.java b/src/main/java/org/escidoc/browser/repository/internal/ContextBuilder.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/repository/internal/ContextRepository.java b/src/main/java/org/escidoc/browser/repository/internal/ContextRepository.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.
@@ -91,8 +91,8 @@ public List<ResourceModel> findTopLevelMembersById(final String id) throws Escid
     }
 
     private List<ResourceModel> findTopLevelMemberList(final String id) throws EscidocClientException {
-        return ModelConverter.genericResourcetoModel(client.retrieveMembersAsList(id, Util
-            .createQueryForTopLevelContainersAndItems(id)));
+        return ModelConverter.genericResourcetoModel(client.retrieveMembersAsList(id,
+            Util.createQueryForTopLevelContainersAndItems(id)));
     }
 
     @Override

diff --git a/src/main/java/org/escidoc/browser/repository/internal/ItemRepository.java b/src/main/java/org/escidoc/browser/repository/internal/ItemRepository.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/repository/internal/OrgUnitProxy.java b/src/main/java/org/escidoc/browser/repository/internal/OrgUnitProxy.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/repository/internal/OrgUnitService.java b/src/main/java/org/escidoc/browser/repository/internal/OrgUnitService.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/repository/internal/OrganizationUnitRepository.java b/src/main/java/org/escidoc/browser/repository/internal/OrganizationUnitRepository.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/repository/internal/PdpRepositoryImpl.java b/src/main/java/org/escidoc/browser/repository/internal/PdpRepositoryImpl.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/repository/internal/RepositoriesImpl.java b/src/main/java/org/escidoc/browser/repository/internal/RepositoriesImpl.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.
@@ -207,7 +207,7 @@ public RoleRepository role() {
         Preconditions.checkNotNull(roleRepository, "roleRepository is null: %s", roleRepository);
         return roleRepository;
     }
-        
+
     public GroupRepository group() {
         return groupRepository;
     }

diff --git a/src/main/java/org/escidoc/browser/repository/internal/SearchRepositoryImpl.java b/src/main/java/org/escidoc/browser/repository/internal/SearchRepositoryImpl.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.
@@ -99,12 +99,15 @@ public SearchRetrieveResponse simpleSearch(final String query) {
             }
         }
 
-        // escidoc.fulltext, escidoc.metadata escidoc.context.name escidoc.creator.name.
+        // escidoc.fulltext, escidoc.metadata escidoc.context.name
+        // escidoc.creator.name.
         // final String queryString = "1=1 ";
         // final StringBuffer buf = new StringBuffer();
         // for (final String string : allMatches) {
-        // buf.append(" or escidoc.any-title=\"" + string + "\" or escidoc.fulltext=\"" + string
-        // + "\" or escidoc.metadata=\"" + string + "\" or escidoc.context.name=\"" + string
+        // buf.append(" or escidoc.any-title=\"" + string +
+        // "\" or escidoc.fulltext=\"" + string
+        // + "\" or escidoc.metadata=\"" + string +
+        // "\" or escidoc.context.name=\"" + string
         // + "\" or escidoc.creator.name=\"" + string + "\"");
         // }
         final String queryString = "";

diff --git a/src/main/java/org/escidoc/browser/repository/internal/StagingRepositoryImpl.java b/src/main/java/org/escidoc/browser/repository/internal/StagingRepositoryImpl.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/repository/internal/UserAccountRepository.java b/src/main/java/org/escidoc/browser/repository/internal/UserAccountRepository.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.
@@ -190,8 +190,8 @@ public void createAttribute(UserProxy userProxy, Attribute attribute) throws Esc
     public void removeAttribute(UserProxy userProxy, String attributeName) throws EscidocClientException {
         Preconditions.checkNotNull(userProxy, "userProxy is null: %s", userProxy);
         Preconditions.checkNotNull(attributeName, "attributeName is null: %s", attributeName);
-        client.deleteAttribute(userProxy.getId(), findAttribute(client.retrieveAttributes(userProxy.getId()),
-            attributeName));
+        client.deleteAttribute(userProxy.getId(),
+            findAttribute(client.retrieveAttributes(userProxy.getId()), attributeName));
     }
 
     private static String findAttribute(Attributes list, String attributeName) {

diff --git a/src/main/java/org/escidoc/browser/repository/internal/UserRepositoryImpl.java b/src/main/java/org/escidoc/browser/repository/internal/UserRepositoryImpl.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/repository/internal/UserService.java b/src/main/java/org/escidoc/browser/repository/internal/UserService.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/repository/internal/UtilRepositoryImpl.java b/src/main/java/org/escidoc/browser/repository/internal/UtilRepositoryImpl.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.
@@ -94,8 +94,9 @@ else if (isContext(parents)) {
     @Override
     public ResourceModel findParent(final HasNoNameResource resource) throws EscidocClientException {
         Preconditions.checkNotNull(resource, "resource is null: %s", resource);
-        Preconditions.checkArgument(resource.getType().equals(ResourceType.ITEM)
-            || resource.getType().equals(ResourceType.CONTAINER), "Only Item and Container is supported");
+        Preconditions.checkArgument(
+            resource.getType().equals(ResourceType.ITEM) || resource.getType().equals(ResourceType.CONTAINER),
+            "Only Item and Container is supported");
 
         final List<Container> parents = repositories.container().findParents(resource);
 
@@ -150,8 +151,10 @@ public Resource getParentContext(final String id) {
     }
 
     // @Override
-    // public List<Container> findParent(final ResourceModel model) throws EscidocClientException {
-    // return repositories.container().findParents(new HasNoNameResourceImpl(model.getId(), model.getType()));
+    // public List<Container> findParent(final ResourceModel model) throws
+    // EscidocClientException {
+    // return repositories.container().findParents(new
+    // HasNoNameResourceImpl(model.getId(), model.getType()));
     // }
 
 }
diff --git a/src/main/java/org/escidoc/browser/ui/ControllerIdList.java b/src/main/java/org/escidoc/browser/ui/ControllerIdList.java
@@ -1,3 +1,31 @@
+/**
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at license/ESCIDOC.LICENSE
+ * or https://www.escidoc.org/license/ESCIDOC.LICENSE .
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at license/ESCIDOC.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ *
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
+ * fuer wissenschaftlich-technische Information mbH and Max-Planck-
+ * Gesellschaft zur Foerderung der Wissenschaft e.V.
+ * All rights reserved.  Use is subject to license terms.
+ */
 package org.escidoc.browser.ui;
 
 //FIXME refactor to enum

diff --git a/src/main/java/org/escidoc/browser/ui/OrganizationSelectionView.java b/src/main/java/org/escidoc/browser/ui/OrganizationSelectionView.java
@@ -3,7 +3,7 @@
  *
  * The contents of this file are subject to the terms of the
  * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
+ * (the "License").  You may not use this file except in compliance
  * with the License.
  *
  * You can obtain a copy of the license at license/ESCIDOC.LICENSE
@@ -24,7 +24,7 @@
  * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
- * All rights reserved. Use is subject to license terms.
+ * All rights reserved.  Use is subject to license terms.
  */
 package org.escidoc.browser.ui;
 
@@ -107,7 +107,8 @@ public Window modalWindow() {
 
             @Override
             public void textChange(TextChangeEvent event) {
-                // // TODO refactor this, the list should not return the data source
+                // // TODO refactor this, the list should not return the data
+                // source
                 Filterable ds = (Filterable) tree.getDataSource();
                 ds.removeAllContainerFilters();
                 filter = new SimpleStringFilter(PropertyId.NAME, event.getText(), true, false);

diff --git a/src/main/java/org/escidoc/browser/ui/Router.java b/src/main/java/org/escidoc/browser/ui/Router.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.
@@ -121,7 +121,8 @@ private void init() {
      * Read the Plugins from a directory
      */
     private void initiatePlugins() {
-        // Determine here the Layout and additional Controllers that have to be used
+        // Determine here the Layout and additional Controllers that have to be
+        // used
         try {
             browserProperties = new Properties();
             browserProperties.load(this.getClass().getClassLoader().getResourceAsStream("browser.properties"));
@@ -298,9 +299,11 @@ public void show(final ResourceModel clickedResource, final boolean shouldReload
         }
     }
 
-    // FIXME we should only use the reflection iff ResourceModel.type is either container or item, otherwise use a
+    // FIXME we should only use the reflection iff ResourceModel.type is either
+    // container or item, otherwise use a
     // normal constructor.
-    // FIXME this is so wrong, we can not inject another object into a controller to create a view. It is impossible?
+    // FIXME this is so wrong, we can not inject another object into a
+    // controller to create a view. It is impossible?
     // to inject, for example, the organization data source into another view.
 
     private Controller buildController(final ResourceModel clickedResource) throws EscidocClientException {
@@ -317,8 +320,9 @@ private Controller buildController(final ResourceModel clickedResource) throws E
                 throw new IllegalArgumentException(msg);
             }
 
-            return (Controller) Class.forName(controllerClassName).getConstructor(Repositories.class, Router.class,
-                ResourceProxy.class).newInstance(repositories, this, fetchResource(clickedResource));
+            return (Controller) Class
+                .forName(controllerClassName).getConstructor(Repositories.class, Router.class, ResourceProxy.class)
+                .newInstance(repositories, this, fetchResource(clickedResource));
         }
         catch (final ClassNotFoundException e) {
             this.getMainWindow().showNotification(ViewConstants.CONTROLLER_ERR_CANNOT_FIND_CLASS,

diff --git a/src/main/java/org/escidoc/browser/ui/UserGroupView.java b/src/main/java/org/escidoc/browser/ui/UserGroupView.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.
@@ -186,7 +186,8 @@ public void handleAction(Action action, @SuppressWarnings("unused") Object sende
     }
 
     protected BeanItemContainer<ResourceModel> populateContainerTable() throws EscidocClientException {
-        // BeanItemContainer<Selector> dataSource = new BeanItemContainer<Selector>(Selector.class, selectorList);
+        // BeanItemContainer<Selector> dataSource = new
+        // BeanItemContainer<Selector>(Selector.class, selectorList);
 
         List<ResourceModel> orgList = new ArrayList<ResourceModel>();
         for (final Selector s : resourceProxy.getSelector()) {

diff --git a/src/main/java/org/escidoc/browser/ui/ViewConstants.java b/src/main/java/org/escidoc/browser/ui/ViewConstants.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/ui/dnd/DragAndDropFileUpload.java b/src/main/java/org/escidoc/browser/ui/dnd/DragAndDropFileUpload.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/ui/dnd/FilesDropBox.java b/src/main/java/org/escidoc/browser/ui/dnd/FilesDropBox.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/ui/dnd/MultipleStreamVariable.java b/src/main/java/org/escidoc/browser/ui/dnd/MultipleStreamVariable.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.
@@ -199,8 +199,8 @@ private boolean areAllFilesStreamed() {
     }
 
     private Component buildNewComponent(final URL contentUrl) throws ParserConfigurationException {
-        return new ComponentBuilder(html5File.getFileName(), StorageType.INTERNAL_MANAGED).withMimeType(
-            html5File.getType()).withContentUrl(contentUrl).build();
+        return new ComponentBuilder(html5File.getFileName(), StorageType.INTERNAL_MANAGED)
+            .withMimeType(html5File.getType()).withContentUrl(contentUrl).build();
     }
 
     private URL putInStagingServer() throws EscidocClientException {

diff --git a/src/main/java/org/escidoc/browser/ui/dnd/WebBrowserUtil.java b/src/main/java/org/escidoc/browser/ui/dnd/WebBrowserUtil.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/ui/helper/EscidocParameterHandler.java b/src/main/java/org/escidoc/browser/ui/helper/EscidocParameterHandler.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/ui/helper/ParamaterDecoder.java b/src/main/java/org/escidoc/browser/ui/helper/ParamaterDecoder.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/ui/helper/ResourceHierarchy.java b/src/main/java/org/escidoc/browser/ui/helper/ResourceHierarchy.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/ui/helper/Util.java b/src/main/java/org/escidoc/browser/ui/helper/Util.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/ui/helper/ViewHelper.java b/src/main/java/org/escidoc/browser/ui/helper/ViewHelper.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/ui/helper/WindowDimension.java b/src/main/java/org/escidoc/browser/ui/helper/WindowDimension.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/ui/helper/internal/CookieHandler.java b/src/main/java/org/escidoc/browser/ui/helper/internal/CookieHandler.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/ui/helper/internal/EscidocParameterHandlerImpl.java b/src/main/java/org/escidoc/browser/ui/helper/internal/EscidocParameterHandlerImpl.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/ui/helper/internal/WindowDimensionImpl.java b/src/main/java/org/escidoc/browser/ui/helper/internal/WindowDimensionImpl.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/ui/landingview/LandingView.java b/src/main/java/org/escidoc/browser/ui/landingview/LandingView.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/ui/landingview/LandingViewImpl.java b/src/main/java/org/escidoc/browser/ui/landingview/LandingViewImpl.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/ui/listeners/AddMetaDataFileItemBehaviour.java b/src/main/java/org/escidoc/browser/ui/listeners/AddMetaDataFileItemBehaviour.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/ui/listeners/AddMetaDataFileItemComponentBehaviour.java b/src/main/java/org/escidoc/browser/ui/listeners/AddMetaDataFileItemComponentBehaviour.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/ui/listeners/AddOrgUnitstoContext.java b/src/main/java/org/escidoc/browser/ui/listeners/AddOrgUnitstoContext.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.

diff --git a/src/main/java/org/escidoc/browser/ui/listeners/AddResourceListener.java b/src/main/java/org/escidoc/browser/ui/listeners/AddResourceListener.java
@@ -21,7 +21,7 @@
  *
  *
  *
- * Copyright 2011 Fachinformationszentrum Karlsruhe Gesellschaft
+ * Copyright 2012 Fachinformationszentrum Karlsruhe Gesellschaft
  * fuer wissenschaftlich-technische Information mbH and Max-Planck-
  * Gesellschaft zur Foerderung der Wissenschaft e.V.
  * All rights reserved.  Use is subject to license terms.