From 8dbde4baf1b31c4a726b2604629c0c58a3eb1dfe Mon Sep 17 00:00:00 2001
From: buczekp <buczekp>
Date: Tue, 12 Jan 2010 15:02:26 +0000
Subject: [PATCH] [LMS-1281] fixed dependencies

SVN: 14255
---
 .../{onlinehelp => }/IOnlineHelpResourceLocatorService.java | 2 +-
 .../web/client/application/framework/DefaultTabItem.java    | 2 +-
 .../client/web/client/application/framework/ITabItem.java   | 2 +-
 .../web/client/application/framework/MainTabPanel.java      | 2 +-
 .../help}/HelpPageIdentifier.java                           | 2 +-
 .../generic/client/web/server/AbstractClientService.java    | 2 +-
 .../generic/client/web/server/HelpRedirectServlet.java      | 2 +-
 .../openbis/generic/shared/translator/DtoConverters.java    | 3 ---
 .../generic/client/web/server/HelpRedirectServletTest.java  | 2 +-
 .../generic/client/web/test/HelpPageIdentifierTest.java     | 6 +++---
 10 files changed, 11 insertions(+), 14 deletions(-)
 rename openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/{onlinehelp => }/IOnlineHelpResourceLocatorService.java (96%)
 rename openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/{onlinehelp => application/help}/HelpPageIdentifier.java (98%)

diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/onlinehelp/IOnlineHelpResourceLocatorService.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/IOnlineHelpResourceLocatorService.java
similarity index 96%
rename from openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/onlinehelp/IOnlineHelpResourceLocatorService.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/IOnlineHelpResourceLocatorService.java
index 61b50af1fba..72b246dd2d5 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/onlinehelp/IOnlineHelpResourceLocatorService.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/IOnlineHelpResourceLocatorService.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.openbis.generic.client.web.client.onlinehelp;
+package ch.systemsx.cisd.openbis.generic.client.web.client;
 
 /**
  * A interface for getting the resources necessary for the help system. Online help is broken into
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/DefaultTabItem.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/DefaultTabItem.java
index 33481a2277e..85e7546329b 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/DefaultTabItem.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/DefaultTabItem.java
@@ -21,9 +21,9 @@ import com.extjs.gxt.ui.client.widget.ContentPanel;
 import com.extjs.gxt.ui.client.widget.Header;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.help.HelpPageIdentifier;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.grid.IDisposableComponent;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.IDelegatedAction;
-import ch.systemsx.cisd.openbis.generic.client.web.client.onlinehelp.HelpPageIdentifier;
 
 /**
  * A default {@link ITabItem} implementation with various factory methods.
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/ITabItem.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/ITabItem.java
index 51fd4f23818..60a3ca9fee6 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/ITabItem.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/ITabItem.java
@@ -19,7 +19,7 @@ package ch.systemsx.cisd.openbis.generic.client.web.client.application.framework
 import com.extjs.gxt.ui.client.widget.Component;
 import com.extjs.gxt.ui.client.widget.TabItem;
 
-import ch.systemsx.cisd.openbis.generic.client.web.client.onlinehelp.HelpPageIdentifier;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.help.HelpPageIdentifier;
 
 /**
  * An interface which contains everything to create a {@link TabItem}.
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/MainTabPanel.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/MainTabPanel.java
index e31c78081a9..bb95db6ce7c 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/MainTabPanel.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/MainTabPanel.java
@@ -40,9 +40,9 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.ICommonClientServiceAs
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.Dict;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.GenericConstants;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.help.HelpPageIdentifier;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.widget.ConfirmationDialog;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.WindowUtils;
-import ch.systemsx.cisd.openbis.generic.client.web.client.onlinehelp.HelpPageIdentifier;
 import ch.systemsx.cisd.openbis.generic.shared.basic.URLMethodWithParameters;
 
 /**
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/onlinehelp/HelpPageIdentifier.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/help/HelpPageIdentifier.java
similarity index 98%
rename from openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/onlinehelp/HelpPageIdentifier.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/help/HelpPageIdentifier.java
index d9e3ecd5f8a..871e5dc10f5 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/onlinehelp/HelpPageIdentifier.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/help/HelpPageIdentifier.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.openbis.generic.client.web.client.onlinehelp;
+package ch.systemsx.cisd.openbis.generic.client.web.client.application.help;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/AbstractClientService.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/AbstractClientService.java
index b460408a72d..da89d1385a1 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/AbstractClientService.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/AbstractClientService.java
@@ -31,6 +31,7 @@ import ch.systemsx.cisd.common.logging.LogFactory;
 import ch.systemsx.cisd.common.servlet.IRequestContextProvider;
 import ch.systemsx.cisd.openbis.BuildAndEnvironmentInfo;
 import ch.systemsx.cisd.openbis.generic.client.web.client.IClientService;
+import ch.systemsx.cisd.openbis.generic.client.web.client.IOnlineHelpResourceLocatorService;
 import ch.systemsx.cisd.openbis.generic.client.web.client.dto.ApplicationInfo;
 import ch.systemsx.cisd.openbis.generic.client.web.client.dto.DefaultResultSetConfig;
 import ch.systemsx.cisd.openbis.generic.client.web.client.dto.IResultSetConfig;
@@ -41,7 +42,6 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.dto.SessionContext;
 import ch.systemsx.cisd.openbis.generic.client.web.client.dto.TableExportCriteria;
 import ch.systemsx.cisd.openbis.generic.client.web.client.dto.User;
 import ch.systemsx.cisd.openbis.generic.client.web.client.exception.InvalidSessionException;
-import ch.systemsx.cisd.openbis.generic.client.web.client.onlinehelp.IOnlineHelpResourceLocatorService;
 import ch.systemsx.cisd.openbis.generic.client.web.server.resultset.CacheManager;
 import ch.systemsx.cisd.openbis.generic.client.web.server.resultset.CachedResultSetManager;
 import ch.systemsx.cisd.openbis.generic.client.web.server.resultset.IOriginalDataProvider;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/HelpRedirectServlet.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/HelpRedirectServlet.java
index 893903becfe..8b0cd6de038 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/HelpRedirectServlet.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/HelpRedirectServlet.java
@@ -26,8 +26,8 @@ import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.mvc.AbstractController;
 
 import ch.systemsx.cisd.common.utilities.Template;
+import ch.systemsx.cisd.openbis.generic.client.web.client.IOnlineHelpResourceLocatorService;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.GenericConstants;
-import ch.systemsx.cisd.openbis.generic.client.web.client.onlinehelp.IOnlineHelpResourceLocatorService;
 import ch.systemsx.cisd.openbis.generic.shared.ResourceNames;
 
 /**
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/DtoConverters.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/DtoConverters.java
index ac66ef7f804..45fecfb0dd2 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/DtoConverters.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/DtoConverters.java
@@ -105,7 +105,6 @@ public class DtoConverters
         // BeanUtils.Converter
         //
 
-        @SuppressWarnings("unused")
         public final DataTypeCode convertToCode(final DataTypePE dataType)
         {
             return DataTypeCode.valueOf(dataType.getCode().name());
@@ -130,13 +129,11 @@ public class DtoConverters
         // BeanUtils.Converter
         //
 
-        @SuppressWarnings("unused")
         public final String convertToDescription(final VocabularyPE vocabulary)
         {
             return StringEscapeUtils.escapeHtml(vocabulary.getDescription());
         }
 
-        @SuppressWarnings("unused")
         public final List<VocabularyTerm> convertToTerms(final VocabularyPE vocabulary)
         {
             final Set<VocabularyTermPE> terms = vocabulary.getTerms();
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/HelpRedirectServletTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/HelpRedirectServletTest.java
index c239d0c801b..0b7e8d77c9c 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/HelpRedirectServletTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/HelpRedirectServletTest.java
@@ -27,8 +27,8 @@ import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 import ch.rinn.restrictions.Friend;
+import ch.systemsx.cisd.openbis.generic.client.web.client.IOnlineHelpResourceLocatorService;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.GenericConstants;
-import ch.systemsx.cisd.openbis.generic.client.web.client.onlinehelp.IOnlineHelpResourceLocatorService;
 
 /**
  * @author Chandrasekhar Ramakrishnan
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/test/HelpPageIdentifierTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/test/HelpPageIdentifierTest.java
index 499dcfb62fa..2cd6a74343c 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/test/HelpPageIdentifierTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/test/HelpPageIdentifierTest.java
@@ -23,9 +23,9 @@ import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
 import ch.rinn.restrictions.Friend;
-import ch.systemsx.cisd.openbis.generic.client.web.client.onlinehelp.HelpPageIdentifier;
-import ch.systemsx.cisd.openbis.generic.client.web.client.onlinehelp.HelpPageIdentifier.HelpPageAction;
-import ch.systemsx.cisd.openbis.generic.client.web.client.onlinehelp.HelpPageIdentifier.HelpPageDomain;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.help.HelpPageIdentifier;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.help.HelpPageIdentifier.HelpPageAction;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.help.HelpPageIdentifier.HelpPageDomain;
 
 /**
  * Test generation of page titles from {@link HelpPageIdentifier}s.
-- 
GitLab