Greg Sheremeta has uploaded a new change for review.
Change subject: userportal, webadmin: rename csh classes
......................................................................
userportal, webadmin: rename csh classes
rename HelpTagJsonServlet -> ContextSensitiveHelpMappingServlet
rename DocumentationPathTranslator -> ContextSensitiveHelpManager
Change-Id: I6d946bc9f7199d1d796b7bcd0a46b4d6d7109bfa
Signed-off-by: Greg Sheremeta <gsher...@redhat.com>
---
R
backend/manager/modules/docs/src/main/java/org/ovirt/engine/docs/utils/servlet/ContextSensitiveHelpMappingServlet.java
M backend/manager/modules/docs/src/main/webapp/WEB-INF/web.xml
M
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/presenter/AbstractModelBoundPopupPresenterWidget.java
R
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/ContextSensitiveHelpManager.java
M
frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/uicommon/UserPortalConfigurator.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/uicommon/WebAdminConfigurator.java
6 files changed, 13 insertions(+), 13 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/00/39300/1
diff --git
a/backend/manager/modules/docs/src/main/java/org/ovirt/engine/docs/utils/servlet/HelpTagJsonServlet.java
b/backend/manager/modules/docs/src/main/java/org/ovirt/engine/docs/utils/servlet/ContextSensitiveHelpMappingServlet.java
similarity index 96%
rename from
backend/manager/modules/docs/src/main/java/org/ovirt/engine/docs/utils/servlet/HelpTagJsonServlet.java
rename to
backend/manager/modules/docs/src/main/java/org/ovirt/engine/docs/utils/servlet/ContextSensitiveHelpMappingServlet.java
index db43bb0..561a16c 100644
---
a/backend/manager/modules/docs/src/main/java/org/ovirt/engine/docs/utils/servlet/HelpTagJsonServlet.java
+++
b/backend/manager/modules/docs/src/main/java/org/ovirt/engine/docs/utils/servlet/ContextSensitiveHelpMappingServlet.java
@@ -35,9 +35,9 @@
* This servlet serves the help tag JSON files for easy consumption by GWT. It
can merge
* multiple files to limit server requests and handle overrides (last file
wins).
*/
-public class HelpTagJsonServlet extends HttpServlet {
+public class ContextSensitiveHelpMappingServlet extends HttpServlet {
private static final long serialVersionUID = -3938947636590096259L;
- private static final Logger log =
LoggerFactory.getLogger(HelpTagJsonServlet.class);
+ private static final Logger log =
LoggerFactory.getLogger(ContextSensitiveHelpMappingServlet.class);
private static final String CONFIG_FILE = "configFile"; //$NON-NLS-1$
diff --git a/backend/manager/modules/docs/src/main/webapp/WEB-INF/web.xml
b/backend/manager/modules/docs/src/main/webapp/WEB-INF/web.xml
index 7dca9bb..ffb7079 100644
--- a/backend/manager/modules/docs/src/main/webapp/WEB-INF/web.xml
+++ b/backend/manager/modules/docs/src/main/webapp/WEB-INF/web.xml
@@ -77,15 +77,15 @@
<!-- help tag mapping servlet -->
<servlet>
- <servlet-name>HelpTagJsonServlet</servlet-name>
-
<servlet-class>org.ovirt.engine.docs.utils.servlet.HelpTagJsonServlet</servlet-class>
+ <servlet-name>ContextSensitiveHelpMappingServlet</servlet-name>
+
<servlet-class>org.ovirt.engine.docs.utils.servlet.ContextSensitiveHelpMappingServlet</servlet-class>
<init-param>
<param-name>configFile</param-name>
<param-value>%{ENGINE_MANUAL}/manual.properties</param-value>
</init-param>
</servlet>
<servlet-mapping>
- <servlet-name>HelpTagJsonServlet</servlet-name>
+ <servlet-name>ContextSensitiveHelpMappingServlet</servlet-name>
<url-pattern>/manual/helptag/*</url-pattern>
</servlet-mapping>
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/presenter/AbstractModelBoundPopupPresenterWidget.java
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/presenter/AbstractModelBoundPopupPresenterWidget.java
index 3c745c6..04491fb 100644
---
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/presenter/AbstractModelBoundPopupPresenterWidget.java
+++
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/presenter/AbstractModelBoundPopupPresenterWidget.java
@@ -1,7 +1,7 @@
package org.ovirt.engine.ui.common.presenter;
import
org.ovirt.engine.ui.common.presenter.popup.DefaultConfirmationPopupPresenterWidget;
-import org.ovirt.engine.ui.common.uicommon.DocumentationPathTranslator;
+import org.ovirt.engine.ui.common.uicommon.ContextSensitiveHelpManager;
import org.ovirt.engine.ui.common.uicommon.model.DeferredModelCommandInvoker;
import org.ovirt.engine.ui.common.uicommon.model.ModelBoundPopupHandler;
import org.ovirt.engine.ui.common.uicommon.model.ModelBoundPopupResolver;
@@ -285,7 +285,7 @@
UICommand openDocumentationCommand =
model.getOpenDocumentationCommand();
if (openDocumentationCommand != null) {
boolean isDocumentationAvailable = hashName != null &&
- DocumentationPathTranslator.getPath(hashName) != null;
+ ContextSensitiveHelpManager.getPath(hashName) != null;
openDocumentationCommand.setIsAvailable(isDocumentationAvailable);
updateHelpCommand(isDocumentationAvailable ?
openDocumentationCommand : null);
}
@@ -336,7 +336,7 @@
protected void openDocumentation(T model) {
String helpTag = model.getHelpTag().name;
- String documentationPath =
DocumentationPathTranslator.getPath(helpTag);
+ String documentationPath =
ContextSensitiveHelpManager.getPath(helpTag);
String documentationLibURL =
model.getConfigurator().getDocumentationLibURL();
WebUtils.openUrlInNewWindow("_blank", documentationLibURL +
documentationPath, //$NON-NLS-1$
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/DocumentationPathTranslator.java
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/ContextSensitiveHelpManager.java
similarity index 96%
rename from
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/DocumentationPathTranslator.java
rename to
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/ContextSensitiveHelpManager.java
index a16c397..d6fd24e 100644
---
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/DocumentationPathTranslator.java
+++
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/ContextSensitiveHelpManager.java
@@ -8,7 +8,7 @@
import com.google.gwt.json.client.JSONObject;
import com.google.gwt.json.client.JSONString;
-public class DocumentationPathTranslator {
+public class ContextSensitiveHelpManager {
private static Map<String, String> documentationPathMap;
// GWT overlay for the JSON object containing the help mappings
diff --git
a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/uicommon/UserPortalConfigurator.java
b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/uicommon/UserPortalConfigurator.java
index 5a8a395..1d695cc 100644
---
a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/uicommon/UserPortalConfigurator.java
+++
b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/uicommon/UserPortalConfigurator.java
@@ -4,7 +4,7 @@
import org.ovirt.engine.core.compat.Version;
import org.ovirt.engine.ui.common.uicommon.ClientAgentType;
-import org.ovirt.engine.ui.common.uicommon.DocumentationPathTranslator;
+import org.ovirt.engine.ui.common.uicommon.ContextSensitiveHelpManager;
import org.ovirt.engine.ui.frontend.AsyncQuery;
import org.ovirt.engine.ui.frontend.INewAsyncCallback;
import org.ovirt.engine.ui.frontend.utils.BaseContextPathData;
@@ -103,7 +103,7 @@
setSpiceVersion(spiceVersion);
} else if
(ev.matchesDefinition(documentationFileFetchedEvent_Definition)) {
String documentationPathFileContent = args.getFileContent();
- DocumentationPathTranslator.init(documentationPathFileContent);
+ ContextSensitiveHelpManager.init(documentationPathFileContent);
} else if (ev.matchesDefinition(usbFilterFileFetchedEvent_Definition))
{
String usbFilter = args.getFileContent();
setUsbFilter(usbFilter);
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/uicommon/WebAdminConfigurator.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/uicommon/WebAdminConfigurator.java
index c47fda7..acdf786 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/uicommon/WebAdminConfigurator.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/uicommon/WebAdminConfigurator.java
@@ -4,7 +4,7 @@
import org.ovirt.engine.core.compat.Version;
import org.ovirt.engine.ui.common.uicommon.ClientAgentType;
-import org.ovirt.engine.ui.common.uicommon.DocumentationPathTranslator;
+import org.ovirt.engine.ui.common.uicommon.ContextSensitiveHelpManager;
import org.ovirt.engine.ui.uicommonweb.Configurator;
import org.ovirt.engine.ui.uicommonweb.models.vms.ISpice;
import org.ovirt.engine.ui.uicommonweb.models.vms.WANDisableEffects;
@@ -54,7 +54,7 @@
setSpiceVersion(spiceVersion);
} else if
(ev.matchesDefinition(documentationFileFetchedEvent_Definition)) {
String documentationPathFileContent = args.getFileContent();
- DocumentationPathTranslator.init(documentationPathFileContent);
+ ContextSensitiveHelpManager.init(documentationPathFileContent);
}
}
--
To view, visit https://gerrit.ovirt.org/39300
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6d946bc9f7199d1d796b7bcd0a46b4d6d7109bfa
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Greg Sheremeta <gsher...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
