details: /erp/devel/pi/rev/340f54dec87e
changeset: 9450:340f54dec87e
user: Martin Taal <martin.taal <at> openbravo.com>
date: Wed Dec 29 17:05:37 2010 +0100
summary: Fixes issue 15542: API Change: the script tags in manual windows
using the selector have changed
diffstat:
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/BaseComponentProvider.java
| 38 ++++++++
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/ComponentProvider.java
| 8 +-
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/KernelComponentProvider.java
| 2 +-
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/KernelConstants.java
| 3 +
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/KernelServlet.java
| 9 +-
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/StaticResourceComponent.java
| 46 ++++++++-
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/StyleSheetResourceComponent.java
| 28 ++++-
7 files changed, 113 insertions(+), 21 deletions(-)
diffs (truncated from 308 to 300 lines):
diff -r 322d25f6d914 -r 340f54dec87e
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/BaseComponentProvider.java
---
a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/BaseComponentProvider.java
Wed Dec 29 17:00:56 2010 +0100
+++
b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/BaseComponentProvider.java
Wed Dec 29 17:05:37 2010 +0100
@@ -18,6 +18,8 @@
*/
package org.openbravo.client.kernel;
+import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import javax.enterprise.inject.Any;
@@ -95,6 +97,16 @@
return null;
}
+ protected ComponentResource createStaticResource(String path, boolean
includeAlsoInClassicMode,
+ boolean includeInNewUIMode) {
+ final ComponentResource componentResource = new ComponentResource();
+ componentResource.setType(ComponentResourceType.Static);
+ componentResource.setPath(path);
+ componentResource.setIncludeAlsoInClassicMode(includeAlsoInClassicMode);
+ componentResource.setIncludeInNewUIMode(includeInNewUIMode);
+ return componentResource;
+ }
+
protected ComponentResource createStaticResource(String path, boolean
includeAlsoInClassicMode) {
final ComponentResource componentResource = new ComponentResource();
componentResource.setType(ComponentResourceType.Static);
@@ -119,6 +131,23 @@
return componentResource;
}
+ /**
+ * Implemented here for backward compatibitility, calls the {...@link
#getGlobalResources()}
+ */
+ public List<ComponentResource> getGlobalComponentResources() {
+ final List<ComponentResource> globalResources = new
ArrayList<ComponentResource>();
+ for (String globalResource : getGlobalResources()) {
+ globalResources.add(createStaticResource(globalResource, true));
+ }
+ return globalResources;
+ }
+
+ @SuppressWarnings("deprecation")
+ // Implemented for backward compatibility
+ public List<String> getGlobalResources() {
+ return Collections.emptyList();
+ }
+
public static class ComponentResource {
public enum ComponentResourceType {
@@ -128,6 +157,7 @@
private ComponentResourceType type;
private String path;
private boolean includeAlsoInClassicMode = false;
+ private boolean includeInNewUIMode = true;
public ComponentResourceType getType() {
return type;
@@ -157,5 +187,13 @@
this.includeAlsoInClassicMode = includeAlsoInClassicMode;
}
+ public boolean isIncludeInNewUIMode() {
+ return includeInNewUIMode;
+ }
+
+ public void setIncludeInNewUIMode(boolean includeInNewUIMode) {
+ this.includeInNewUIMode = includeInNewUIMode;
+ }
+
}
}
diff -r 322d25f6d914 -r 340f54dec87e
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/ComponentProvider.java
---
a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/ComponentProvider.java
Wed Dec 29 17:00:56 2010 +0100
+++
b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/ComponentProvider.java
Wed Dec 29 17:05:37 2010 +0100
@@ -51,7 +51,13 @@
/**
* @return the global resources which are needed to be present on every page.
*/
- public List<ComponentResource> getGlobalResources();
+ public List<ComponentResource> getGlobalComponentResources();
+
+ /**
+ * @return the global resources which are needed to be present on every page.
+ * @deprecated implement getGlobalComponentResources
+ */
+ public List<String> getGlobalResources();
/**
* @return the Module to which this provider belongs
diff -r 322d25f6d914 -r 340f54dec87e
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/KernelComponentProvider.java
---
a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/KernelComponentProvider.java
Wed Dec 29 17:00:56 2010 +0100
+++
b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/KernelComponentProvider.java
Wed Dec 29 17:05:37 2010 +0100
@@ -81,7 +81,7 @@
* @return an empty String (no global resources)
* @see org.openbravo.client.kernel.ComponentProvider#getGlobalResources()
*/
- public List<ComponentResource> getGlobalResources() {
+ public List<ComponentResource> getGlobalComponentResources() {
final List<ComponentResource> globalResources = new
ArrayList<ComponentResource>();
globalResources.add(createStaticResource("org.openbravo.client.kernel/"
+ KernelConstants.KERNEL_COMPONENT_TYPE + "/" +
KernelConstants.APPLICATION_COMPONENT_ID,
diff -r 322d25f6d914 -r 340f54dec87e
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/KernelConstants.java
---
a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/KernelConstants.java
Wed Dec 29 17:00:56 2010 +0100
+++
b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/KernelConstants.java
Wed Dec 29 17:05:37 2010 +0100
@@ -47,7 +47,10 @@
public static final String RESOURCE_VERSION_PARAMETER = "_version";
public static final String RESOURCE_LANGUAGE_PARAMETER = "_language";
public static final String SKIN_VERSION_PARAMETER = "_skinVersion";
+ public static final String SKIN_VERSION_300 = "3.00";
+ public static final String SKIN_VERSION_CLASSIC = "2.50_emulation";
public static final String MODE_PARAMETER = "_mode";
+ public static final String MODE_PARAMETER_300 = "3.00";
public static final String MODE_PARAMETER_CLASSIC = "classic";
public static final String STYLE_SHEET_COMPONENT_ID = "StyleSheetResources";
diff -r 322d25f6d914 -r 340f54dec87e
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/KernelServlet.java
---
a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/KernelServlet.java
Wed Dec 29 17:00:56 2010 +0100
+++
b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/KernelServlet.java
Wed Dec 29 17:05:37 2010 +0100
@@ -34,6 +34,7 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.log4j.Logger;
+import org.jboss.weld.environment.servlet.Listener;
import org.openbravo.base.ConfigParameters;
import org.openbravo.base.HttpBaseUtils;
import org.openbravo.base.util.OBClassLoader;
@@ -89,6 +90,9 @@
super.init(config);
globalParameters =
ConfigParameters.retrieveFrom(config.getServletContext());
servletContext = config.getServletContext();
+ final Object beanManager = config.getServletContext().getAttribute(
+ Listener.BEAN_MANAGER_ATTRIBUTE_NAME);
+ System.err.println(beanManager);
}
@Override
@@ -237,9 +241,10 @@
if (!parameterMap.containsKey(KernelConstants.SKIN_VERSION_PARAMETER)) {
if (OBContext.getOBContext().isNewUI()) { // FIXME: isNewUI true the
first load?
- parameterMap.put(KernelConstants.SKIN_VERSION_PARAMETER, "3.00");
+ parameterMap.put(KernelConstants.SKIN_VERSION_PARAMETER,
KernelConstants.SKIN_VERSION_300);
} else {
- parameterMap.put(KernelConstants.SKIN_VERSION_PARAMETER,
"2.50_emulation");
+ parameterMap.put(KernelConstants.SKIN_VERSION_PARAMETER,
+ KernelConstants.SKIN_VERSION_CLASSIC);
}
}
diff -r 322d25f6d914 -r 340f54dec87e
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/StaticResourceComponent.java
---
a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/StaticResourceComponent.java
Wed Dec 29 17:00:56 2010 +0100
+++
b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/StaticResourceComponent.java
Wed Dec 29 17:05:37 2010 +0100
@@ -56,7 +56,8 @@
if (isInDevelopment == null) {
isInDevelopment = false;
for (ComponentProvider provider : componentProviders) {
- if (provider.getGlobalResources() == null) {
+ final List<ComponentResource> resources =
provider.getGlobalComponentResources();
+ if (resources == null || resources.size() == 0) {
continue;
}
if (provider.getModule().isInDevelopment()) {
@@ -91,8 +92,24 @@
// them
// directly and not the document.write, see here:
// http://www.codehouse.com/javascript/articles/external/
- return "document.write(\"<s\" + \"cript type='text/javascript' src='" +
getContextUrl()
- + GEN_TARGET_LOCATION + "/" + getStaticResourceFileName() +
".js'><\\/s\"+\"cript>\");";
+
+ final boolean classicMode =
!getParameters().containsKey(KernelConstants.MODE_PARAMETER)
+ || !getParameters().get(KernelConstants.MODE_PARAMETER).equals(
+ KernelConstants.MODE_PARAMETER_300);
+
+ StringBuilder result = new StringBuilder();
+ if (classicMode) {
+ result
+ .append("document.write(\"<LINK rel='stylesheet' type='text/css'
href='"
+ + getContextUrl()
+ +
"org.openbravo.client.kernel/OBCLKER_Kernel/StyleSheetResources?_skinVersion=2.50_emulation&_mode=classic'></link>\");\n");
+ result
+ .append("var
isomorphicDir='../web/org.openbravo.userinterface.smartclient/isomorphic/';\n");
+ }
+ result.append("document.write(\"<s\" + \"cript type='text/javascript'
src='"
+ + getContextUrl() + GEN_TARGET_LOCATION + "/" +
getStaticResourceFileName()
+ + ".js'><\\/s\"+\"cript>\");");
+ return result.toString();
} catch (Exception e) {
log.error("Error generating component; " + e.getMessage(), e);
} finally {
@@ -117,23 +134,34 @@
KernelConstants.SERVLET_CONTEXT);
final StringBuffer sb = new StringBuffer();
- final boolean classicMode =
getParameters().containsKey(KernelConstants.MODE_PARAMETER)
- && getParameters().get(KernelConstants.MODE_PARAMETER).equals(
- KernelConstants.MODE_PARAMETER_CLASSIC);
+ final boolean classicMode =
!getParameters().containsKey(KernelConstants.MODE_PARAMETER)
+ || !getParameters().get(KernelConstants.MODE_PARAMETER).equals(
+ KernelConstants.MODE_PARAMETER_300);
+
+ final String skinParam;
+ if (classicMode) {
+ skinParam = KernelConstants.SKIN_VERSION_CLASSIC;
+ } else {
+ skinParam = KernelConstants.SKIN_VERSION_300;
+ }
int cntDynamicScripts = 0;
for (Module module : modules) {
for (ComponentProvider provider : componentProviders) {
- if (provider.getGlobalResources() == null) {
+ final List<ComponentResource> resources =
provider.getGlobalComponentResources();
+ if (resources == null || resources.size() == 0) {
continue;
}
if (provider.getModule().getId().equals(module.getId())) {
- for (ComponentResource resource : provider.getGlobalResources()) {
+ for (ComponentResource resource : resources) {
if (classicMode && !resource.isIncludeAlsoInClassicMode()) {
continue;
}
+ if (!classicMode && !resource.isIncludeInNewUIMode()) {
+ continue;
+ }
log.debug("Processing resource: " + resource);
String resourcePath = resource.getPath();
@@ -150,7 +178,7 @@
// Skin version handling
if
(resourcePath.contains(KernelConstants.SKIN_VERSION_PARAMETER)) {
resourcePath =
resourcePath.replaceAll(KernelConstants.SKIN_VERSION_PARAMETER,
- getParameter(KernelConstants.SKIN_VERSION_PARAMETER));
+ skinParam);
}
try {
diff -r 322d25f6d914 -r 340f54dec87e
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/StyleSheetResourceComponent.java
---
a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/StyleSheetResourceComponent.java
Wed Dec 29 17:00:56 2010 +0100
+++
b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/StyleSheetResourceComponent.java
Wed Dec 29 17:05:37 2010 +0100
@@ -70,12 +70,13 @@
for (Module module : modules) {
boolean hasStyleSheet = false;
for (ComponentProvider provider : componentProviders) {
- if (provider.getGlobalResources() == null) {
+ final List<ComponentResource> resources =
provider.getGlobalComponentResources();
+ if (resources == null || resources.size() == 0) {
continue;
}
if (provider.getModule().getId().equals(module.getId())) {
- for (ComponentResource resource : provider.getGlobalResources()) {
+ for (ComponentResource resource : resources) {
if (resource.getType() == ComponentResourceType.Stylesheet) {
hasStyleSheet = true;
break;
@@ -98,21 +99,32 @@
KernelConstants.SERVLET_CONTEXT);
final StringBuffer sb = new StringBuffer();
- final boolean classicMode =
getParameters().containsKey(KernelConstants.MODE_PARAMETER)
- && getParameters().get(KernelConstants.MODE_PARAMETER).equals(
- KernelConstants.MODE_PARAMETER_CLASSIC);
+ final boolean classicMode =
!getParameters().containsKey(KernelConstants.MODE_PARAMETER)
+ || !getParameters().get(KernelConstants.MODE_PARAMETER).equals(
+ KernelConstants.MODE_PARAMETER_300);
+
+ final String skinParam;
+ if (classicMode) {
+ skinParam = KernelConstants.SKIN_VERSION_CLASSIC;
+ } else {
+ skinParam = KernelConstants.SKIN_VERSION_300;
+ }
for (Module module : modules) {
for (ComponentProvider provider : componentProviders) {
- if (provider.getGlobalResources() == null) {
+ final List<ComponentResource> resources =
provider.getGlobalComponentResources();
+ if (resources == null || resources.size() == 0) {
continue;
}
if (provider.getModule().getId().equals(module.getId())) {
- for (ComponentResource resource : provider.getGlobalResources()) {
+ for (ComponentResource resource : resources) {
if (classicMode && !resource.isIncludeAlsoInClassicMode()) {
continue;
}
+ if (!classicMode && !resource.isIncludeInNewUIMode()) {
+ continue;
+ }
log.debug("Processing resource: " + resource);
if (resource.getType() == ComponentResourceType.Stylesheet) {
String resourcePath = resource.getPath();
@@ -120,7 +132,7 @@
------------------------------------------------------------------------------
Learn how Oracle Real Application Clusters (RAC) One Node allows customers
to consolidate database storage, standardize their database environment, and,
should the need arise, upgrade to a full multi-node Oracle RAC database
without downtime or disruption
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
