ktlili 2005/06/24 16:27:49 CEST
Modified files:
war/src/java/com/jahia/clipping/XML ClipperParser.java
ElementBuilder.java
war/src/java/com/jahia/clipping/web WebBrowserSimulator.java
war/src/java/com/jahia/clipping/web/html/Impl
ChewExtractorFilter.java
VisibilityPositionVisitor.java
war/src/java/com/jahia/clipping/web/html/Impl/HTMLParser
LabelBuilderVisitor.java
Log:
- fix Session handle bug for method browsing whitout javascript
- fix Visibility bug (hidden element became visible when they're selected)
Revision Changes Path
1.7 +3 -2
webclip_builder/war/src/java/com/jahia/clipping/XML/ClipperParser.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/src/java/com/jahia/clipping/XML/ClipperParser.java.diff?r1=1.6&r2=1.7&f=h
1.8 +5 -5
webclip_builder/war/src/java/com/jahia/clipping/XML/ElementBuilder.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/src/java/com/jahia/clipping/XML/ElementBuilder.java.diff?r1=1.7&r2=1.8&f=h
1.4 +5 -0
webclip_builder/war/src/java/com/jahia/clipping/web/WebBrowserSimulator.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/src/java/com/jahia/clipping/web/WebBrowserSimulator.java.diff?r1=1.3&r2=1.4&f=h
1.6 +1 -1
webclip_builder/war/src/java/com/jahia/clipping/web/html/Impl/ChewExtractorFilter.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/src/java/com/jahia/clipping/web/html/Impl/ChewExtractorFilter.java.diff?r1=1.5&r2=1.6&f=h
1.2 +2 -2
webclip_builder/war/src/java/com/jahia/clipping/web/html/Impl/HTMLParser/LabelBuilderVisitor.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/src/java/com/jahia/clipping/web/html/Impl/HTMLParser/LabelBuilderVisitor.java.diff?r1=1.1&r2=1.2&f=h
1.2 +9 -2
webclip_builder/war/src/java/com/jahia/clipping/web/html/Impl/VisibilityPositionVisitor.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/src/java/com/jahia/clipping/web/html/Impl/VisibilityPositionVisitor.java.diff?r1=1.1&r2=1.2&f=h
Index: ClipperParser.java
===================================================================
RCS file:
/home/cvs/repository/webclip_builder/war/src/java/com/jahia/clipping/XML/ClipperParser.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ClipperParser.java 24 Jun 2005 13:37:39 -0000 1.6
+++ ClipperParser.java 24 Jun 2005 14:27:48 -0000 1.7
@@ -404,8 +404,9 @@
public String getQueryDefault(int posUrl, int posParam) {
Element queryEle = getQueryParam(posUrl, posParam);
String encrypted =
queryEle.getAttributeValue(Label.PARAMETER_DEFAULT);
- String defaultValue =
DESUtilities.getInstance().encrypt(Label.KEY_ENCRYPT, encrypted);
- return defaultValue;
+ // String defaultValue =
DESUtilities.getInstance().encrypt(Label.KEY_ENCRYPT, encrypted);
+ //return defaultValue;
+ return encrypted;
}
Index: ElementBuilder.java
===================================================================
RCS file:
/home/cvs/repository/webclip_builder/war/src/java/com/jahia/clipping/XML/ElementBuilder.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ElementBuilder.java 24 Jun 2005 13:37:39 -0000 1.7
+++ ElementBuilder.java 24 Jun 2005 14:27:48 -0000 1.8
@@ -170,9 +170,8 @@
//form-param_attributes
ele.setAttribute(Label.PARAMETER_NAME, name);
ele.setAttribute(Label.PARAMETER_MAPPING, mapping);
- if (type.equalsIgnoreCase(WebConstants.TYPE_PASSWORD)) {
- ele.setAttribute(Label.PARAMETER_TYPE, type);
- }
+ ele.setAttribute(Label.PARAMETER_TYPE, type);
+
ele.setAttribute(Label.PARAMETER_VISIBILITY, visibility);
ele.setAttribute(Label.FORM_PARENT_NAME, formParentName);
ele.setAttribute(Label.FORM_PARENT_ID, formParentId);
@@ -200,8 +199,9 @@
Element ele = new Element(Label.PARAMETER);
//query-param_attributes
ele.setAttribute(Label.PARAMETER_NAME, name);
- String encrypted =
DESUtilities.getInstance().encrypt(Label.KEY_ENCRYPT, defaultValue);
- ele.setAttribute(Label.PARAMETER_DEFAULT, encrypted);
+ //String encrypted =
DESUtilities.getInstance().encrypt(Label.KEY_ENCRYPT, defaultValue);
+ //ele.setAttribute(Label.PARAMETER_DEFAULT, encrypted);
+ ele.setAttribute(Label.PARAMETER_DEFAULT, defaultValue);
return ele;
}
Index: WebBrowserSimulator.java
===================================================================
RCS file:
/home/cvs/repository/webclip_builder/war/src/java/com/jahia/clipping/web/WebBrowserSimulator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- WebBrowserSimulator.java 24 Jun 2005 13:37:40 -0000 1.3
+++ WebBrowserSimulator.java 24 Jun 2005 14:27:49 -0000 1.4
@@ -288,6 +288,10 @@
//update the url bean
doc = updateUrlBeanAndGetDoument(getRequest(),
getResponse(), uBean);
+
+ //build the user document
+ doc.getUserDocumentAsString();
+
uBean.setDocument(doc);
urlPosition = i;
}
@@ -459,6 +463,7 @@
else {
// update value from the URLWrapper
httpMethod = uw.getMethod();
+ logger.debug("httpMehod found in the url wrapper:
"+httpMethod);
url = uw.getSourceUrl();
uBean.setUrlValue(url);
}
Index: ChewExtractorFilter.java
===================================================================
RCS file:
/home/cvs/repository/webclip_builder/war/src/java/com/jahia/clipping/web/html/Impl/ChewExtractorFilter.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ChewExtractorFilter.java 24 Jun 2005 13:37:40 -0000 1.5
+++ ChewExtractorFilter.java 24 Jun 2005 14:27:49 -0000 1.6
@@ -171,7 +171,7 @@
setStyleAndPosition(tag, visibility,
position);
}
else {
- // setStyleAndPosition(tag, "visibility:
hidden;", "");
+ setChildrenVisibilityAndPosition(tag,
count);
}
countTable++;
}
Index: VisibilityPositionVisitor.java
===================================================================
RCS file:
/home/cvs/repository/webclip_builder/war/src/java/com/jahia/clipping/web/html/Impl/VisibilityPositionVisitor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- VisibilityPositionVisitor.java 23 Jun 2005 16:15:49 -0000 1.1
+++ VisibilityPositionVisitor.java 24 Jun 2005 14:27:49 -0000 1.2
@@ -32,12 +32,19 @@
[EMAIL PROTECTED] count The new ChildrenVisibilityAndPosition value
*/
public void setChildrenVisibilityAndPosition(Tag tag, int count) {
+
+ //if the tag is hidden, don't change it's value
+ String currentStyle = tag.getAttribute("style");
+ if (currentStyle != null && currentStyle.indexOf("hidden") >
-1) {
+ setStyleAndPosition(tag, "visibility: hidden;", "");
+ }
+
// set visibility of all childrfen of the selected tag
if (count > 0) {
Tag parent = (Tag) tag.getParent();
String parentStyle = parent.getAttribute("style");
// it means that the parent is visible
- if (parentStyle !=null &&
parentStyle.indexOf("visible") > -1) {
+ if (parentStyle != null &&
parentStyle.indexOf("visible") > -1) {
setStyleAndPosition(tag, "visibility:
visible;", "");
}
// it means that the parent tag is hidden
@@ -81,7 +88,7 @@
return;
}
- //others tag
+ //others tag
String style = tag.getAttribute("sytle");
if (style == null) {
tag.setAttribute("style", visibility + position);
Index: LabelBuilderVisitor.java
===================================================================
RCS file:
/home/cvs/repository/webclip_builder/war/src/java/com/jahia/clipping/web/html/Impl/HTMLParser/LabelBuilderVisitor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LabelBuilderVisitor.java 23 Jun 2005 16:15:50 -0000 1.1
+++ LabelBuilderVisitor.java 24 Jun 2005 14:27:49 -0000 1.2
@@ -62,7 +62,7 @@
if (tag instanceof InputTag) {
//logger.debug("[ Process inputTag ]");
String type =
tag.getAttribute(HTML.Attribute.TYPE.toString());
- if (transformer.editableInputParameter(type)) {
+ //if (transformer.editableInputParameter(type)) {
TagNode label = buildParameterLabel((InputTag)
tag);
NodeList newChildren = new NodeList();
newChildren.add(label);
@@ -71,7 +71,7 @@
newChildren.add(children);
}
tag.setChildren(newChildren);
- }
+ //}
}
}
