JBoss Rich Faces SVN: r20125 - in sandbox/trunk/ui/fileupload/ui/src/main/java/org/richfaces: request and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2010-11-19 13:02:08 -0500 (Fri, 19 Nov 2010)
New Revision: 20125
Removed:
sandbox/trunk/ui/fileupload/ui/src/main/java/org/richfaces/request/MultipartRequestRegistry.java
Modified:
sandbox/trunk/ui/fileupload/ui/src/main/java/org/richfaces/application/FileUploadPhaselistener.java
sandbox/trunk/ui/fileupload/ui/src/main/java/org/richfaces/request/MultipartRequest.java
Log:
RF-9497
Modified: sandbox/trunk/ui/fileupload/ui/src/main/java/org/richfaces/application/FileUploadPhaselistener.java
===================================================================
--- sandbox/trunk/ui/fileupload/ui/src/main/java/org/richfaces/application/FileUploadPhaselistener.java 2010-11-19 15:47:43 UTC (rev 20124)
+++ sandbox/trunk/ui/fileupload/ui/src/main/java/org/richfaces/application/FileUploadPhaselistener.java 2010-11-19 18:02:08 UTC (rev 20125)
@@ -52,16 +52,16 @@
private static final long serialVersionUID = 138000954953175986L;
private static final Pattern AMPERSAND = Pattern.compile("&+");
-
+
private static final Logger LOGGER = RichfacesLogger.APPLICATION.getLogger();
-
- private static final String UID = "rf_fu_uid";
+ private static final String UID_KEY = "rf_fu_uid";
+
/** Flag indicating whether a temporary file should be used to cache the uploaded file */
private boolean createTempFiles = false;
private String tempFilesDirectory;
-
+
/** The maximum size of a file upload request. 0 means no limit. */
private int maxRequestSize = 0;
@@ -73,9 +73,9 @@
} else {
this.createTempFiles = true;
}
-
+
this.tempFilesDirectory = context.getInitParameter("tempFilesDirectory");
-
+
param = context.getInitParameter("maxRequestSize");
if (param != null) {
this.maxRequestSize = Integer.parseInt(param);
@@ -87,16 +87,16 @@
*
* @see javax.faces.event.PhaseListener#afterPhase(javax.faces.event.PhaseEvent)
*/
- public void afterPhase(PhaseEvent event) {
- if (PhaseId.APPLY_REQUEST_VALUES.equals(event.getPhaseId())) {
- FacesContext facesContext = event.getFacesContext();
- Object request = facesContext.getExternalContext().getRequest();
- if (request instanceof MultipartRequest) {
- printResponse(facesContext, HttpServletResponse.SC_OK,
- "<html id=\"" + UID + ((MultipartRequest)request).getUploadId() + ":done\"/>");
- }
- }
- }
+ public void afterPhase(PhaseEvent event) {
+ if (PhaseId.APPLY_REQUEST_VALUES.equals(event.getPhaseId())) {
+ FacesContext facesContext = event.getFacesContext();
+ Object request = facesContext.getExternalContext().getRequest();
+ if (request instanceof MultipartRequest) {
+ printResponse(facesContext, HttpServletResponse.SC_OK, "<html id=\"" + UID_KEY
+ + ((MultipartRequest) request).getUploadId() + ":done\"/>");
+ }
+ }
+ }
/*
* (non-Javadoc)
@@ -105,75 +105,58 @@
*/
public void beforePhase(PhaseEvent event) {
if (PhaseId.RESTORE_VIEW.equals(event.getPhaseId())) {
- FacesContext facesContext = event.getFacesContext();
- ExternalContext externalContext = facesContext.getExternalContext();
- HttpServletRequest request = (HttpServletRequest) externalContext
- .getRequest();
- Map<String, String> queryParamMap = parseQueryString(request
- .getQueryString());
- String uid = queryParamMap.get(UID);
- if (uid != null) {
- if (maxRequestSize != 0
- && externalContext.getRequestContentLength() > maxRequestSize) {
- boolean sendError = Boolean.parseBoolean(queryParamMap
- .get(MultipartRequest.SEND_HTTP_ERROR));
- if (sendError) {
- printResponse(
- facesContext,
- HttpServletResponse.SC_REQUEST_ENTITY_TOO_LARGE,
- null);
- } else {
- printResponse(facesContext, HttpServletResponse.SC_OK,
- "<html id=\"" + UID + uid + ":size_restricted\"/>");
- }
- } else if (!checkFileCount(externalContext,
- queryParamMap.get("id"))) {
- printResponse(facesContext, HttpServletResponse.SC_OK,
- "<html id=\"" + UID + uid + ":forbidden\"/>");
- } else {
- MultipartRequest multipartRequest = new MultipartRequest(
- request, createTempFiles, tempFilesDirectory,
- maxRequestSize, uid);
- try {
- multipartRequest.parseRequest();
- if (!multipartRequest.isDone()) {
- printResponse(facesContext,
- HttpServletResponse.SC_OK,
- "<html id=\"" + UID + uid + ":stopped\"/>");
- } else {
- externalContext.setRequest(multipartRequest);
- }
- } catch (FileUploadException e) {
- printResponse(facesContext,
- HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
- null);
- throw e; //TODO remove it
- } finally {
- multipartRequest.clearRequestData();
- }
- }
- }
- }
+ FacesContext facesContext = event.getFacesContext();
+ ExternalContext externalContext = facesContext.getExternalContext();
+ HttpServletRequest request = (HttpServletRequest) externalContext.getRequest();
+ Map<String, String> queryParamMap = parseQueryString(request.getQueryString());
+ String uid = queryParamMap.get(UID_KEY);
+ if (uid != null) {
+ if (maxRequestSize != 0 && externalContext.getRequestContentLength() > maxRequestSize) {
+ printResponse(facesContext, HttpServletResponse.SC_OK, "<html id=\"" + UID_KEY + uid
+ + ":size_restricted\"/>");
+ } else if (!checkFileCount(externalContext, queryParamMap.get("id"))) {
+ printResponse(facesContext, HttpServletResponse.SC_OK, "<html id=\"" + UID_KEY + uid
+ + ":forbidden\"/>");
+ } else {
+ MultipartRequest multipartRequest = new MultipartRequest(request, createTempFiles,
+ tempFilesDirectory, maxRequestSize, uid);
+ try {
+ multipartRequest.parseRequest();
+ if (!multipartRequest.isDone()) {
+ printResponse(facesContext, HttpServletResponse.SC_OK, "<html id=\"" + UID_KEY + uid
+ + ":stopped\"/>");
+ } else {
+ externalContext.setRequest(multipartRequest);
+ }
+ } catch (FileUploadException e) {
+ printResponse(facesContext, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, null);
+ throw e; // TODO remove it
+ } finally {
+ multipartRequest.clearRequestData();
+ }
+ }
+ }
+ }
}
private boolean checkFileCount(ExternalContext externalContext, String idParameter) {
- //TODO implement this method
-// HttpSession session = externalContext.getSession(false);
-//
-// if (session != null) {
-// Map<String, Integer> map = (Map<String, Integer>) session
-// .getAttribute(FileUploadConstants.UPLOADED_COUNTER);
-//
-// if (map != null) {
-// String id = idParameter;
-// if (id != null) {
-// Integer i = map.get(id);
-// if (i != null && i == 0) {
-// return false;
-// }
-// }
-// }
-// }
+ // TODO implement this method
+ // HttpSession session = externalContext.getSession(false);
+ //
+ // if (session != null) {
+ // Map<String, Integer> map = (Map<String, Integer>) session
+ // .getAttribute(FileUploadConstants.UPLOADED_COUNTER);
+ //
+ // if (map != null) {
+ // String id = idParameter;
+ // if (id != null) {
+ // Integer i = map.get(id);
+ // if (i != null && i == 0) {
+ // return false;
+ // }
+ // }
+ // }
+ // }
return true;
}
@@ -196,7 +179,7 @@
parameters.put(name, value);
}
} catch (UnsupportedEncodingException e) {
- //log warning and skip this parameter
+ // log warning and skip this parameter
LOGGER.warn(e.getLocalizedMessage(), e);
}
}
Modified: sandbox/trunk/ui/fileupload/ui/src/main/java/org/richfaces/request/MultipartRequest.java
===================================================================
--- sandbox/trunk/ui/fileupload/ui/src/main/java/org/richfaces/request/MultipartRequest.java 2010-11-19 15:47:43 UTC (rev 20124)
+++ sandbox/trunk/ui/fileupload/ui/src/main/java/org/richfaces/request/MultipartRequest.java 2010-11-19 18:02:08 UTC (rev 20125)
@@ -51,11 +51,6 @@
public class MultipartRequest extends HttpServletRequestWrapper {
- /**
- * Request parameter that allow to send HTTP error instead of html message
- */
- public static final String SEND_HTTP_ERROR = "_richfaces_send_http_error";
-
public static final String TEXT_HTML = "text/html";
private static final BytesHandler NOOP_HANDLER = new BytesHandler() {
@@ -70,9 +65,6 @@
/** Session bean name where progress bar's percent map will be stored */
private static final String PERCENT_BEAN_NAME = "_richfaces_upload_percents";
- /** Session bean name where stop keys will be stored */
- private static final String REQUEST_KEYS_BEAN_NAME = "_richfaces_request_keys";
-
private static final String PARAM_NAME = "name";
private static final String PARAM_FILENAME = "filename";
private static final String PARAM_CONTENT_TYPE = "Content-Type";
@@ -85,8 +77,8 @@
private static final byte CR = 0x0d;
private static final byte LF = 0x0a;
- private static final byte[] CR_LF = {CR, LF};
- private static final byte[] HYPHENS = {0x2d, 0x2d}; // '--'
+ private static final byte[] CR_LF = { CR, LF };
+ private static final byte[] HYPHENS = { 0x2d, 0x2d }; // '--'
private static final Pattern PARAM_VALUE_PATTERN = Pattern.compile("^\\s*([^\\s=]+)\\s*[=:]\\s*(.+)\\s*$");
@@ -113,12 +105,6 @@
private Map<String, Integer> requestSizeMap = null;
- private Map<String, String> requestKeysMap = null;
-
- private String requestKey = null;
-
- private MultipartRequestRegistry requestRegistry;
-
private List<String> keys = new ArrayList<String>();
private byte[] boundaryMarker;
@@ -188,25 +174,20 @@
private String decodeFileName(String name) {
String fileName = null;
-
try {
- if (getRequest().getParameter(SEND_HTTP_ERROR) != null) {
- fileName = new String(name.getBytes(encoding), "UTF-8");
- } else {
- StringBuffer buffer = new StringBuffer();
- String[] codes = name.split(";");
- if (codes != null) {
- for (String code : codes) {
- if (code.startsWith("&")) {
- String sCode = code.replaceAll("[&#]*", "");
- Integer iCode = Integer.parseInt(sCode);
- buffer.append(Character.toChars(iCode));
- } else {
- buffer.append(code);
- }
+ StringBuffer buffer = new StringBuffer();
+ String[] codes = name.split(";");
+ if (codes != null) {
+ for (String code : codes) {
+ if (code.startsWith("&")) {
+ String sCode = code.replaceAll("[&#]*", "");
+ Integer iCode = Integer.parseInt(sCode);
+ buffer.append(Character.toChars(iCode));
+ } else {
+ buffer.append(code);
}
- fileName = buffer.toString();
}
+ fileName = buffer.toString();
}
} catch (Exception e) {
fileName = name;
@@ -407,29 +388,9 @@
}
}
- public static MultipartRequest lookupRequest(FacesContext context, String uploadId) {
- Map<String, Object> sessionMap = context.getExternalContext().getSessionMap();
- @SuppressWarnings("unchecked")
- Map<String, String> requestKeys = (Map<String, String>) sessionMap.get(REQUEST_KEYS_BEAN_NAME);
- if (requestKeys != null) {
- String requestKey = requestKeys.get(uploadId);
- if (requestKey != null) {
- MultipartRequestRegistry requestRegistry = MultipartRequestRegistry.getInstance(context);
- if (requestRegistry != null) {
- MultipartRequest request = requestRegistry.getRequest(requestKey);
- if (request != null) {
- return request;
- }
- }
- }
- }
-
- return null;
- }
-
@SuppressWarnings("unchecked")
private void setupProgressData() {
- if (percentMap == null || requestSizeMap == null || requestKeysMap == null) {
+ if (percentMap == null || requestSizeMap == null) {
FacesContext facesContext = FacesContext.getCurrentInstance();
if (facesContext != null) {
ExternalContext externalContext = facesContext.getExternalContext();
@@ -454,25 +415,11 @@
sessionMap.put(REQUEST_SIZE_BEAN_NAME, requestSizeMap);
}
}
-
- if (requestKeysMap == null) {
- requestKeysMap = (Map<String, String>) sessionMap.get(REQUEST_KEYS_BEAN_NAME);
- if (requestKeysMap == null) {
- requestKeysMap = new ConcurrentHashMap<String, String>();
- sessionMap.put(REQUEST_KEYS_BEAN_NAME, requestKeysMap);
- }
-
- }
}
percentMap.put(uploadId, Double.valueOf(0));
requestSizeMap.put(uploadId, getSize());
-
- requestRegistry = MultipartRequestRegistry.getInstance(facesContext);
- requestKey = requestRegistry.registerRequest(this);
- requestKeysMap.put(uploadId, requestKey);
-
}
}
}
@@ -645,7 +592,7 @@
vals.toArray(values);
return values;
} else {
- return new String[] {(String) vp.getValue() };
+ return new String[] { (String) vp.getValue() };
}
} else {
return super.getParameterValues(name);
@@ -731,13 +678,5 @@
if (requestSizeMap != null) {
requestSizeMap.remove(uploadId);
}
-
- if (requestKeysMap != null) {
- requestKeysMap.remove(uploadId);
- }
-
- if (requestRegistry != null) {
- requestRegistry.removeRequest(requestKey);
- }
}
}
\ No newline at end of file
Deleted: sandbox/trunk/ui/fileupload/ui/src/main/java/org/richfaces/request/MultipartRequestRegistry.java
===================================================================
--- sandbox/trunk/ui/fileupload/ui/src/main/java/org/richfaces/request/MultipartRequestRegistry.java 2010-11-19 15:47:43 UTC (rev 20124)
+++ sandbox/trunk/ui/fileupload/ui/src/main/java/org/richfaces/request/MultipartRequestRegistry.java 2010-11-19 18:02:08 UTC (rev 20125)
@@ -1,76 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright ${year}, Red Hat, Inc. and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.richfaces.request;
-
-import java.util.Map;
-import java.util.UUID;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import javax.faces.context.FacesContext;
-
-final class MultipartRequestRegistry {
-
- private static final String REGISTRY_ATTRIBUTE_NAME = MultipartRequestRegistry.class.getName();
-
- private AtomicInteger atomicInteger = new AtomicInteger(0);
-
- private String registryId = UUID.randomUUID().toString();
-
- private Map<String, MultipartRequest> requestsMap = new ConcurrentHashMap<String, MultipartRequest>();
-
- private MultipartRequestRegistry() {
-
- }
-
- public static MultipartRequestRegistry getInstance(FacesContext context) {
- Map<String, Object> applicationMap = context.getExternalContext().getApplicationMap();
- // MultipartRequestRegistry requestRegistry = (MultipartRequestRegistry) applicationMap
- // .get(REGISTRY_ATTRIBUTE_NAME);
- // if (requestRegistry == null) {
- synchronized (applicationMap) {
- MultipartRequestRegistry requestRegistry = (MultipartRequestRegistry) applicationMap
- .get(REGISTRY_ATTRIBUTE_NAME);
- if (requestRegistry == null) {
- requestRegistry = new MultipartRequestRegistry();
- applicationMap.put(REGISTRY_ATTRIBUTE_NAME, requestRegistry);
- }
- // }
- return requestRegistry;
- }
- }
-
- public String registerRequest(MultipartRequest request) {
- String key = registryId + ":" + atomicInteger.incrementAndGet();
- requestsMap.put(key, request);
-
- return key;
- }
-
- public void removeRequest(String key) {
- requestsMap.remove(key);
- }
-
- public MultipartRequest getRequest(String key) {
- return requestsMap.get(key);
- }
-}
13 years, 6 months
JBoss Rich Faces SVN: r20124 - sandbox/trunk/ui/drag-drop/ui/src/main/java/org/richfaces/component/behavior.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2010-11-19 10:47:43 -0500 (Fri, 19 Nov 2010)
New Revision: 20124
Modified:
sandbox/trunk/ui/drag-drop/ui/src/main/java/org/richfaces/component/behavior/DragBehavior.java
sandbox/trunk/ui/drag-drop/ui/src/main/java/org/richfaces/component/behavior/DropBehavior.java
Log:
checkstyles fixes
Modified: sandbox/trunk/ui/drag-drop/ui/src/main/java/org/richfaces/component/behavior/DragBehavior.java
===================================================================
--- sandbox/trunk/ui/drag-drop/ui/src/main/java/org/richfaces/component/behavior/DragBehavior.java 2010-11-19 15:20:42 UTC (rev 20123)
+++ sandbox/trunk/ui/drag-drop/ui/src/main/java/org/richfaces/component/behavior/DragBehavior.java 2010-11-19 15:47:43 UTC (rev 20124)
@@ -34,10 +34,8 @@
*/
@JsfBehavior(
- id = DragBehavior.BEHAVIOR_ID,
- tag = @Tag(name = "dragBehavior",
- handler = "org.richfaces.view.facelets.html.CustomBehaviorHandler",
- type = TagType.Facelets))
+ id = DragBehavior.BEHAVIOR_ID, tag = @Tag(name = "dragBehavior", handler = "org.richfaces.view.facelets.html.CustomBehaviorHandler", type = TagType.Facelets)
+)
public class DragBehavior extends ClientBehavior {
public static final String BEHAVIOR_ID = "org.richfaces.component.behavior.DragBehavior";
Modified: sandbox/trunk/ui/drag-drop/ui/src/main/java/org/richfaces/component/behavior/DropBehavior.java
===================================================================
--- sandbox/trunk/ui/drag-drop/ui/src/main/java/org/richfaces/component/behavior/DropBehavior.java 2010-11-19 15:20:42 UTC (rev 20123)
+++ sandbox/trunk/ui/drag-drop/ui/src/main/java/org/richfaces/component/behavior/DropBehavior.java 2010-11-19 15:47:43 UTC (rev 20124)
@@ -34,10 +34,7 @@
*/
@JsfBehavior(
- id = DropBehavior.BEHAVIOR_ID,
- tag = @Tag(name = "dropBehavior",
- handler = "org.richfaces.view.facelets.html.CustomBehaviorHandler",
- type = TagType.Facelets))
+ id = DropBehavior.BEHAVIOR_ID, tag = @Tag(name = "dropBehavior", handler = "org.richfaces.view.facelets.html.CustomBehaviorHandler", type = TagType.Facelets))
public class DropBehavior extends ClientBehavior {
public static final String BEHAVIOR_ID = "org.richfaces.component.behavior.DropBehavior";
13 years, 6 months
JBoss Rich Faces SVN: r20123 - in sandbox/trunk/ui/drag-drop/ui/src/main/java/org/richfaces: component/behavior and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2010-11-19 10:20:42 -0500 (Fri, 19 Nov 2010)
New Revision: 20123
Added:
sandbox/trunk/ui/drag-drop/ui/src/main/java/org/richfaces/component/behavior/
sandbox/trunk/ui/drag-drop/ui/src/main/java/org/richfaces/component/behavior/DragBehavior.java
sandbox/trunk/ui/drag-drop/ui/src/main/java/org/richfaces/component/behavior/DropBehavior.java
Removed:
sandbox/trunk/ui/drag-drop/ui/src/main/java/org/richfaces/component/AbstractDragSupport.java
sandbox/trunk/ui/drag-drop/ui/src/main/java/org/richfaces/component/AbstractDropSupport.java
Modified:
sandbox/trunk/ui/drag-drop/ui/src/main/java/org/richfaces/renderkit/DragBehaviorRendererBase.java
sandbox/trunk/ui/drag-drop/ui/src/main/java/org/richfaces/renderkit/DropBehaviorRendererBase.java
Log:
implement DnD as behavior
Deleted: sandbox/trunk/ui/drag-drop/ui/src/main/java/org/richfaces/component/AbstractDragSupport.java
===================================================================
--- sandbox/trunk/ui/drag-drop/ui/src/main/java/org/richfaces/component/AbstractDragSupport.java 2010-11-19 14:56:10 UTC (rev 20122)
+++ sandbox/trunk/ui/drag-drop/ui/src/main/java/org/richfaces/component/AbstractDragSupport.java 2010-11-19 15:20:42 UTC (rev 20123)
@@ -1,51 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright ${year}, Red Hat, Inc. and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-
-package org.richfaces.component;
-
-import org.richfaces.cdk.annotations.JsfComponent;
-import org.richfaces.cdk.annotations.JsfRenderer;
-import org.richfaces.cdk.annotations.Tag;
-
-
-/**
- * @author abelevich
- *
- */
-
-@JsfComponent(
- generate = "org.richfaces.component.UIDragSupport",
- renderer = @JsfRenderer(type = "org.richfaces.DragSupportRenderer"),
- tag = @Tag(name="dragSupport"),
- type = AbstractDragSupport.COMPONENT_TYPE,
- family = AbstractDragSupport.COMPONENT_FAMILY
-)
-public abstract class AbstractDragSupport extends AbstractActionComponent {
-
- public static final String COMPONENT_TYPE = "org.richfaces.DragSupport";
-
- public static final String COMPONENT_FAMILY = "org.richfaces.DragSupport";
-
-}
-
-
Deleted: sandbox/trunk/ui/drag-drop/ui/src/main/java/org/richfaces/component/AbstractDropSupport.java
===================================================================
--- sandbox/trunk/ui/drag-drop/ui/src/main/java/org/richfaces/component/AbstractDropSupport.java 2010-11-19 14:56:10 UTC (rev 20122)
+++ sandbox/trunk/ui/drag-drop/ui/src/main/java/org/richfaces/component/AbstractDropSupport.java 2010-11-19 15:20:42 UTC (rev 20123)
@@ -1,46 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright ${year}, Red Hat, Inc. and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.richfaces.component;
-
-import org.richfaces.cdk.annotations.JsfComponent;
-import org.richfaces.cdk.annotations.JsfRenderer;
-import org.richfaces.cdk.annotations.Tag;
-
-/**
- * @author abelevich
- *
- */
-@JsfComponent(
- generate = "org.richfaces.component.UIDropSupport",
- renderer = @JsfRenderer(type = "org.richfaces.DropSupportRenderer"),
- tag = @Tag(name="dropSupport"),
- type = AbstractDropSupport.COMPONENT_TYPE,
- family = AbstractDropSupport.COMPONENT_FAMILY
- )
-public abstract class AbstractDropSupport extends AbstractActionComponent {
-
- public static final String COMPONENT_TYPE = "org.richfaces.DropSupport";
-
- public static final String COMPONENT_FAMILY = "org.richfaces.DropSupport";
-
-}
Added: sandbox/trunk/ui/drag-drop/ui/src/main/java/org/richfaces/component/behavior/DragBehavior.java
===================================================================
--- sandbox/trunk/ui/drag-drop/ui/src/main/java/org/richfaces/component/behavior/DragBehavior.java (rev 0)
+++ sandbox/trunk/ui/drag-drop/ui/src/main/java/org/richfaces/component/behavior/DragBehavior.java 2010-11-19 15:20:42 UTC (rev 20123)
@@ -0,0 +1,49 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright ${year}, Red Hat, Inc. and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+
+package org.richfaces.component.behavior;
+
+import org.ajax4jsf.component.behavior.ClientBehavior;
+import org.richfaces.cdk.annotations.JsfBehavior;
+import org.richfaces.cdk.annotations.Tag;
+import org.richfaces.cdk.annotations.TagType;
+
+/**
+ * @author abelevich
+ *
+ */
+
+@JsfBehavior(
+ id = DragBehavior.BEHAVIOR_ID,
+ tag = @Tag(name = "dragBehavior",
+ handler = "org.richfaces.view.facelets.html.CustomBehaviorHandler",
+ type = TagType.Facelets))
+public class DragBehavior extends ClientBehavior {
+
+ public static final String BEHAVIOR_ID = "org.richfaces.component.behavior.DragBehavior";
+
+ @Override
+ public void setLiteralAttribute(String name, Object value) {
+
+ }
+}
Added: sandbox/trunk/ui/drag-drop/ui/src/main/java/org/richfaces/component/behavior/DropBehavior.java
===================================================================
--- sandbox/trunk/ui/drag-drop/ui/src/main/java/org/richfaces/component/behavior/DropBehavior.java (rev 0)
+++ sandbox/trunk/ui/drag-drop/ui/src/main/java/org/richfaces/component/behavior/DropBehavior.java 2010-11-19 15:20:42 UTC (rev 20123)
@@ -0,0 +1,49 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright ${year}, Red Hat, Inc. and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+
+package org.richfaces.component.behavior;
+
+import org.ajax4jsf.component.behavior.ClientBehavior;
+import org.richfaces.cdk.annotations.JsfBehavior;
+import org.richfaces.cdk.annotations.Tag;
+import org.richfaces.cdk.annotations.TagType;
+
+/**
+ * @author abelevich
+ *
+ */
+
+@JsfBehavior(
+ id = DropBehavior.BEHAVIOR_ID,
+ tag = @Tag(name = "dropBehavior",
+ handler = "org.richfaces.view.facelets.html.CustomBehaviorHandler",
+ type = TagType.Facelets))
+public class DropBehavior extends ClientBehavior {
+
+ public static final String BEHAVIOR_ID = "org.richfaces.component.behavior.DropBehavior";
+
+ @Override
+ public void setLiteralAttribute(String name, Object value) {
+ }
+
+}
Modified: sandbox/trunk/ui/drag-drop/ui/src/main/java/org/richfaces/renderkit/DragBehaviorRendererBase.java
===================================================================
--- sandbox/trunk/ui/drag-drop/ui/src/main/java/org/richfaces/renderkit/DragBehaviorRendererBase.java 2010-11-19 14:56:10 UTC (rev 20122)
+++ sandbox/trunk/ui/drag-drop/ui/src/main/java/org/richfaces/renderkit/DragBehaviorRendererBase.java 2010-11-19 15:20:42 UTC (rev 20123)
@@ -24,6 +24,7 @@
import javax.faces.application.ResourceDependencies;
import javax.faces.application.ResourceDependency;
+import javax.faces.render.ClientBehaviorRenderer;
/**
* @author abelevich
@@ -37,6 +38,6 @@
@ResourceDependency(name = "richfaces.js"),
@ResourceDependency(name = "richfaces-dnd.js")
})
-public class DragBehaviorRendererBase extends AjaxComponentRendererBase {
+public class DragBehaviorRendererBase extends ClientBehaviorRenderer {
}
Modified: sandbox/trunk/ui/drag-drop/ui/src/main/java/org/richfaces/renderkit/DropBehaviorRendererBase.java
===================================================================
--- sandbox/trunk/ui/drag-drop/ui/src/main/java/org/richfaces/renderkit/DropBehaviorRendererBase.java 2010-11-19 14:56:10 UTC (rev 20122)
+++ sandbox/trunk/ui/drag-drop/ui/src/main/java/org/richfaces/renderkit/DropBehaviorRendererBase.java 2010-11-19 15:20:42 UTC (rev 20123)
@@ -24,6 +24,7 @@
import javax.faces.application.ResourceDependencies;
import javax.faces.application.ResourceDependency;
+import javax.faces.render.ClientBehaviorRenderer;
/**
* @author abelevich
@@ -37,5 +38,5 @@
@ResourceDependency(name = "richfaces.js"),
@ResourceDependency(name = "richfaces-dnd.js")
})
-public class DropBehaviorRendererBase extends AjaxComponentRendererBase {
+public class DropBehaviorRendererBase extends ClientBehaviorRenderer {
}
13 years, 6 months
JBoss Rich Faces SVN: r20122 - in management/design-4x: toolbar and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2010-11-19 09:56:10 -0500 (Fri, 19 Nov 2010)
New Revision: 20122
Added:
management/design-4x/toolbar/
management/design-4x/toolbar/images/
management/design-4x/toolbar/images/but_bg.png
management/design-4x/toolbar/images/copy.gif
management/design-4x/toolbar/images/create_doc.gif
management/design-4x/toolbar/images/create_folder.gif
management/design-4x/toolbar/images/filter.gif
management/design-4x/toolbar/images/find.gif
management/design-4x/toolbar/images/gd.png
management/design-4x/toolbar/images/input_bg.png
management/design-4x/toolbar/images/save.gif
management/design-4x/toolbar/images/save_all.gif
management/design-4x/toolbar/images/save_as.gif
management/design-4x/toolbar/images/sep.gif
management/design-4x/toolbar/images/sep2.gif
management/design-4x/toolbar/images/sep3.gif
management/design-4x/toolbar/toolbar_new.html
Log:
toolbar RF4 design
Added: management/design-4x/toolbar/images/but_bg.png
===================================================================
(Binary files differ)
Property changes on: management/design-4x/toolbar/images/but_bg.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: management/design-4x/toolbar/images/copy.gif
===================================================================
(Binary files differ)
Property changes on: management/design-4x/toolbar/images/copy.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: management/design-4x/toolbar/images/create_doc.gif
===================================================================
(Binary files differ)
Property changes on: management/design-4x/toolbar/images/create_doc.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: management/design-4x/toolbar/images/create_folder.gif
===================================================================
(Binary files differ)
Property changes on: management/design-4x/toolbar/images/create_folder.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: management/design-4x/toolbar/images/filter.gif
===================================================================
(Binary files differ)
Property changes on: management/design-4x/toolbar/images/filter.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: management/design-4x/toolbar/images/find.gif
===================================================================
(Binary files differ)
Property changes on: management/design-4x/toolbar/images/find.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: management/design-4x/toolbar/images/gd.png
===================================================================
(Binary files differ)
Property changes on: management/design-4x/toolbar/images/gd.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: management/design-4x/toolbar/images/input_bg.png
===================================================================
(Binary files differ)
Property changes on: management/design-4x/toolbar/images/input_bg.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: management/design-4x/toolbar/images/save.gif
===================================================================
(Binary files differ)
Property changes on: management/design-4x/toolbar/images/save.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: management/design-4x/toolbar/images/save_all.gif
===================================================================
(Binary files differ)
Property changes on: management/design-4x/toolbar/images/save_all.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: management/design-4x/toolbar/images/save_as.gif
===================================================================
(Binary files differ)
Property changes on: management/design-4x/toolbar/images/save_as.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: management/design-4x/toolbar/images/sep.gif
===================================================================
(Binary files differ)
Property changes on: management/design-4x/toolbar/images/sep.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: management/design-4x/toolbar/images/sep2.gif
===================================================================
(Binary files differ)
Property changes on: management/design-4x/toolbar/images/sep2.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: management/design-4x/toolbar/images/sep3.gif
===================================================================
(Binary files differ)
Property changes on: management/design-4x/toolbar/images/sep3.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: management/design-4x/toolbar/toolbar_new.html
===================================================================
--- management/design-4x/toolbar/toolbar_new.html (rev 0)
+++ management/design-4x/toolbar/toolbar_new.html 2010-11-19 14:56:10 UTC (rev 20122)
@@ -0,0 +1,150 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/loose.dtd">
+<html>
+<head>
+ <title>Toolbar</title>
+
+ <style type="text/css">
+ body{
+ font:normal 11px Verdana, sans-serif;
+ }
+ input[type="text"]{
+ background-color:#FFFFFF;
+ background-image:url("images/input_bg.png");
+ border-color:#BED6F8;
+ color:#000000;
+ font-family:Arial,Verdana,sans-serif;
+ font-size:11px;
+ }
+ input[type="text"]{
+ background-position:1px 1px;
+ background-repeat:no-repeat;
+ border-style:inset;
+ border-width:1px;
+ }
+ .barsearch {
+ height:14px;
+ width:100px;
+ }
+ input[type="submit"] {
+ background-color:#BED6F8;
+ background-image:url("images/but_bg.png");
+ border-color:#BED6F8;
+ color:#000000;
+ font-family:Arial,Verdana,sans-serif;
+ font-size:11px;
+ }
+ input[type="submit"] {
+ background-position:left top;
+ background-repeat:repeat-x;
+ border-width:1px;
+ margin:0;
+ }
+
+ /*--- RF ToolBar styles ---*/
+ .rf-tb{
+ background:#BED6F8 url("images/gd.png") left top repeat-x;/*Gradient - from headerGradientColor to headerBackgroundColor, background-color - headerBackgroundColor*/
+ border:1px solid #BED6F8;/*panelBorderColor*/
+ color:#000000;/*headerTextColor*/
+ font-family:Arial, Verdana, sans-serif;/*headerFamilyFont*/
+ font-size:11px;/*headerSizeFont*/
+ font-weight:bold;/*headerWeightFont*/
+ height:36px;
+ width:100%;
+ }
+ .rf-tb-cntr{
+ vertical-align:middle;
+ }
+ .rf-tb-itm{
+ padding:0 8px;
+ white-space:nowrap;
+ }
+ .rf-tb-sep{
+ background:url(images/sep.gif) no-repeat center center;
+ padding:0 10px;
+ text-align:center;
+ }
+
+ /*--- styleClass ---*/
+ .icon, .label{
+ vertical-align:middle;
+ }
+ </style>
+</head>
+<body>
+ <h1>ToolBar</h1>
+
+ <table cellspacing="0" cellpadding="0" class="rf-tb">
+ <tbody>
+ <tr class="rf-tb-cntr">
+ <td class="rf-tb-itm">
+ <a class="label" href="#">File</a>
+ </td>
+ <td class="rf-tb-itm">
+ <img class="icon" src="images/create_folder.gif" alt="Toolbar icon"/>
+ </td>
+ <td class="rf-tb-itm">
+ <a class="label" href="#">View</a>
+ </td>
+ <td class="rf-tb-itm">
+ <img class="icon" src="images/copy.gif" alt="Toolbar icon"/>
+ </td>
+ <td class="rf-tb-sep"></td>
+ <td class="rf-tb-itm">
+ <img class="icon" src="images/save.gif" alt="Toolbar icon"/>
+ </td>
+ <td class="rf-tb-itm">
+ <img class="icon" src="images/save_as.gif" alt="Toolbar icon"/>
+ </td>
+ <td class="rf-tb-itm">
+ <img class="icon" src="images/save_all.gif" alt="Toolbar icon"/>
+ </td>
+ <td style="width: 100%;"></td>
+ </tr>
+ </tbody>
+ </table>
+
+ <br>
+ <h1>ToolBarGroup</h1>
+
+ <table cellspacing="0" cellpadding="0" class="rf-tb">
+ <tbody>
+ <tr class="rf-tb-cntr">
+ <td class="rf-tb-itm">
+ <a class="label" href="#">File</a>
+ </td>
+ <td class="rf-tb-itm">
+ <img class="icon" src="images/create_folder.gif" alt="Toolbar icon"/>
+ </td>
+ <td class="rf-tb-itm">
+ <img class="icon" src="images/copy.gif" alt="Toolbar icon"/>
+ </td>
+ <td class="rf-tb-sep"></td>
+ <td class="rf-tb-itm">
+ <img class="icon" src="images/save.gif" alt="Toolbar icon"/>
+ </td>
+ <td class="rf-tb-itm">
+ <img class="icon" src="images/save_as.gif" alt="Toolbar icon"/>
+ </td>
+ <td class="rf-tb-itm">
+ <img class="icon" src="images/save_all.gif" alt="Toolbar icon"/>
+ </td>
+ <td style="width: 100%;"></td>
+ <td class="rf-tb-itm">
+ <img class="icon" src="images/find.gif" alt="Toolbar icon"/>
+ </td>
+ <td class="rf-tb-itm">
+ <img class="icon" src="images/filter.gif" alt="Toolbar icon"/>
+ </td>
+ <td class="rf-tb-sep"></td>
+ <td class="rf-tb-itm">
+ <input type="text" class="barsearch" />
+ </td>
+ <td class="rf-tb-itm">
+ <input type="submit" onclick="return false;" value="Search" />
+ </td>
+ </tr>
+ </tbody>
+ </table>
+
+</body>
+</html>
13 years, 6 months
JBoss Rich Faces SVN: r20121 - in management/design-4x: dropDownMenu-new and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2010-11-19 09:40:14 -0500 (Fri, 19 Nov 2010)
New Revision: 20121
Added:
management/design-4x/dropDownMenu-new/
management/design-4x/dropDownMenu-new/dropDownMenu_new.html
management/design-4x/dropDownMenu-new/images/
management/design-4x/dropDownMenu-new/images/copy.gif
management/design-4x/dropDownMenu-new/images/ico1.gif
management/design-4x/dropDownMenu-new/images/ico2.gif
management/design-4x/dropDownMenu-new/images/input_bg.png
management/design-4x/dropDownMenu-new/images/menu_item_bg.gif
management/design-4x/dropDownMenu-new/images/menu_list_bg.gif
management/design-4x/dropDownMenu-new/images/node.gif
management/design-4x/dropDownMenu-new/images/spacer.gif
Log:
Updated DDM design committed
Added: management/design-4x/dropDownMenu-new/dropDownMenu_new.html
===================================================================
--- management/design-4x/dropDownMenu-new/dropDownMenu_new.html (rev 0)
+++ management/design-4x/dropDownMenu-new/dropDownMenu_new.html 2010-11-19 14:40:14 UTC (rev 20121)
@@ -0,0 +1,233 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+ <head>
+ <title>DropDownMenu</title>
+ <style type="text/css">
+ body{
+ font:normal 12px Verdana, sans-serif;
+ }
+ input[type="text"]{
+ background-color:#FFFFFF;
+ background-image:url("images/input_bg.png");
+ border-color:#BED6F8;
+ color:#000000;
+ font-family:Arial,Verdana,sans-serif;
+ font-size:11px;
+ }
+ input[type="text"]{
+ background-position:1px 1px;
+ background-repeat:no-repeat;
+ border-style:inset;
+ border-width:1px;
+ }
+
+ /*--- RF DropDownMenu styles ---*/
+ .rf-ddm-lbl, .rf-ddm-lbl-dis {
+ font-family:Arial, Verdana, sans-serif;
+ font-size:11px;
+ position:relative;
+ }
+ .rf-ddm-lbl-unsel {
+ border:0 solid transparent;
+ padding:3px 6px;
+ }
+ .rf-ddm-lbl, .rf-ddm-lbl-dis {
+ height:auto;
+ padding:2px 5px;
+ white-space:nowrap;
+ width:auto;
+ }
+ .rf-ddm-pos{
+ top:20px;
+ left:0;
+ position:absolute;
+ }
+ .rf-ddm-lbl-dec {
+ font-weight:bold;
+ }
+ .rf-ddm-lst {
+ border:1px solid #bfbfc0; /*panelBorderColor*/
+ background-color: #e7f2fb; /*additionalBackgroundColor*/
+ position:absolute;
+ }
+ .rf-ddm-sublst {
+ position:absolute;
+ top:-8px;
+ left:13px;
+ }
+ .rf-ddm-lst-bg {
+ border: 1px solid #e7f2fb; /*additionalBackgroundColor*/
+ border-bottom:0;
+ background: url(images/menu_list_bg.gif) repeat-y left; /*from additionalBackgroundColor (left) to tabBackgroundColor (right)*/
+ }
+ .rf-ddm-itm {
+ padding : 1px 35px 1px 1px;
+ white-space : nowrap;
+ font-family : verdana; /*generalFamilyFont*/
+ font-size : 12px; /*generalSizeFont*/
+ position : relative;
+ }
+ .rf-ddm-itm-unsel {
+ border : 1px solid transparent;
+ padding : 1px 36px 2px 2px;
+ }
+ .rf-ddm-itm-sel {
+ border : 1px solid #4a70ab; /*headerBackgroundColor*/
+ cursor : pointer;
+ padding : 1px 36px 2px 2px;
+ background : url(menu_item_bg.gif) /*from additionalBackgroundColor (top) to tabBackgroundColor (bottom)*/ repeat-x top #a9c5e7;
+ z-index:10;
+ }
+ .rf-ddm-itm-dis {
+ border : 1px solid transparent;
+ cursor : default;
+ color : #839eca; /*tabDisabledTextColor*/
+ }
+ .rf-ddm-itm-ic {
+ display:inline-block;
+ margin: 0 10px 0 0;
+ vertical-align:middle;
+ }
+ .rf-ddm-itm-lbl {
+ color : #000000; /*generalTextColor*/
+ display:inline-block;
+ text-decoration : none;
+ z-index:2;
+ }
+ .rf-ddm-sep {
+ font-size : 0px;
+ border-top: 1px solid #bfbfc0; /*panelBorderColor*/
+ margin : 2px 0px 2px 24px;
+ }
+ .rf-ddm-nd {
+ background : url(images/node.gif) no-repeat top;
+ font-size: 1px;
+ width: 7px;
+ height: 7px;
+ top: 7px;
+ right: 6px;
+ position : absolute;
+ }
+ .rf-ddm-itm-dis .rf-ddm-nd {
+ background-position : bottom;
+ }
+ .rf-ddm-strut{
+ font-size: 0px;
+ border: 0px;
+ margin: 0px;
+ width: 250px;
+ background: #e7f2fb; /*additionalBackgroundColor*/
+ }
+
+ /*--- styleClass ---*/
+ .icon{
+ vertical-align:middle;
+ }
+ .menuCkeckbox{
+ margin:0;
+ width:16px;
+ }
+ </style>
+ </head>
+
+ <body>
+ <h1>DropDownMenu</h1>
+ <div class="rf-ddm-lbl rf-ddm-lbl-unsel">
+ <div class="rf-ddm-lbl-dec">
+ <img width="16" height="16" class="icon" src="images/copy.gif" alt="Menu icon"/> File
+ </div>
+ <div class="rf-ddm-pos">
+ <div class="rf-ddm-lst">
+ <div class="rf-ddm-lst-bg">
+ <div class="rf-ddm-itm rf-ddm-itm-unsel" onmouseover="this.className='rf-ddm-itm rf-ddm-itm-sel'" onmouseout="this.className='rf-ddm-itm rf-ddm-itm-unsel'">
+ <span class="rf-ddm-itm-ic">
+ <input type="checkbox" class="menuCkeckbox"/>
+ </span>
+ <span class="rf-ddm-itm-lbl">testString 1.1</span>
+ </div>
+ <div class="rf-ddm-sep"></div>
+ <div class="rf-ddm-itm rf-ddm-itm-unsel" onmouseover="this.className='rf-ddm-itm rf-ddm-itm-sel'" onmouseout="this.className='rf-ddm-itm rf-ddm-itm-unsel'">
+ <span class="rf-ddm-itm-ic"><img width="16" height="16" src="images/ico1.gif" alt="Menu item icon"/></span>
+ <span class="rf-ddm-itm-lbl">testString 1.2</span>
+ </div>
+ <div class="rf-ddm-itm rf-ddm-itm-unsel" onmouseover="this.className='rf-ddm-itm rf-ddm-itm-sel'" onmouseout="this.className='rf-ddm-itm rf-ddm-itm-unsel'">
+ <span class="rf-ddm-itm-ic"><img width="16" height="16" src="images/ico2.gif" alt="Menu item icon"/></span>
+ <span class="rf-ddm-itm-lbl">testString 1.3</span>
+ <div class="rf-ddm-nd">
+ <div class="rf-ddm-lst rf-ddm-sublst">
+ <div class="rf-ddm-lst-bg">
+ <div class="rf-ddm-itm rf-ddm-itm-unsel" onmouseover="this.className='rf-ddm-itm rf-ddm-itm-sel'" onmouseout="this.className='rf-ddm-itm rf-ddm-itm-unsel'">
+ <span class="rf-ddm-itm-ic"><img width="16" height="16" src="images/spacer.gif" alt="Menu item icon"></span>
+ <span class="rf-ddm-itm-lbl">testString 2.1</span>
+ </div>
+ <div class="rf-ddm-itm rf-ddm-itm-unsel" onmouseover="this.className='rf-ddm-itm rf-ddm-itm-sel'" onmouseout="this.className='rf-ddm-itm rf-ddm-itm-unsel'">
+ <span class="rf-ddm-itm-ic"><img width="16" height="16" src="images/ico1.gif" alt="Menu item icon"/></span>
+ <span class="rf-ddm-itm-lbl">testString 2.2</span>
+ </div>
+ <div class="rf-ddm-sep"></div>
+ <div class="rf-ddm-itm rf-ddm-itm-unsel" onmouseover="this.className='rf-ddm-itm rf-ddm-itm-sel'" onmouseout="this.className='rf-ddm-itm rf-ddm-itm-unsel'">
+ <span class="rf-ddm-itm-ic"><img width="16" height="16" src="images/ico2.gif" alt="Menu item icon"/></span>
+ <span class="rf-ddm-itm-lbl">
+ <input type="text"/>
+ </span>
+ <div class="rf-ddm-nd">
+ <div class="rf-ddm-lst rf-ddm-sublst">
+ <div class="rf-ddm-lst-bg">
+ <div class="rf-ddm-itm rf-ddm-itm-unsel" onmouseover="this.className='rf-ddm-itm rf-ddm-itm-sel'" onmouseout="this.className='rf-ddm-itm rf-ddm-itm-unsel'">
+ <span class="rf-ddm-itm-ic"><img width="16" height="16" src="images/spacer.gif" alt="Menu item icon"></span>
+ <span class="rf-ddm-itm-lbl">testString 3.1</span>
+ </div>
+ <div class="rf-ddm-itm rf-ddm-itm-unsel" onmouseover="this.className='rf-ddm-itm rf-ddm-itm-sel'" onmouseout="this.className='rf-ddm-itm rf-ddm-itm-unsel'">
+ <span class="rf-ddm-itm-ic"><img width="16" height="16" src="images/ico1.gif" alt="Menu item icon"/></span>
+ <span class="rf-ddm-itm-lbl">testString 3.2</span>
+ </div>
+ <div class="rf-ddm-itm rf-ddm-itm-unsel" onmouseover="this.className='rf-ddm-itm rf-ddm-itm-sel'" onmouseout="this.className='rf-ddm-itm rf-ddm-itm-unsel'">
+ <span class="rf-ddm-itm-ic"><img width="16" height="16" src="images/ico2.gif" alt="Menu item icon"/></span>
+ <span class="rf-ddm-itm-lbl">testString 3.3</span>
+ </div>
+ <div class="rf-ddm-sep"></div>
+ <div class="rf-ddm-itm rf-ddm-itm-dis">
+ <span class="rf-ddm-itm-ic"><img width="16" height="16" src="images/spacer.gif" alt="Menu item icon"></span>
+ testString 3.4
+ </div>
+ <div class="rf-ddm-itm rf-ddm-itm-unsel" onmouseover="this.className='rf-ddm-itm rf-ddm-itm-sel'" onmouseout="this.className='rf-ddm-itm rf-ddm-itm-unsel'">
+ <span class="rf-ddm-itm-ic"><img width="16" height="16" src="images/spacer.gif" alt="Menu item icon"></span>
+ <span class="rf-ddm-itm-lbl"><a href="#">testString 3.5 testString 3.5 testString 3.5</a></span>
+ </div>
+ <div class="rf-ddm-strut"><img src="images/spacer.gif" width="1" height="1" alt="" border="0"/></div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="rf-ddm-sep"></div>
+ <div class="rf-ddm-itm rf-ddm-itm-dis">
+ <span class="rf-ddm-itm-ic"><img width="16" height="16" src="images/spacer.gif" alt="Menu item icon"></span>
+ testString 2.4
+ <div class="rf-ddm-nd"></div>
+ </div>
+ <div class="rf-ddm-itm rf-ddm-itm-unsel" onmouseover="this.className='rf-ddm-itm rf-ddm-itm-sel'" onmouseout="this.className='rf-ddm-itm rf-ddm-itm-unsel'">
+ <span class="rf-ddm-itm-ic"><img width="16" height="16" src="images/spacer.gif" alt="Menu item icon"></span>
+ <span class="rf-ddm-itm-lbl">testString 2.5</span>
+ </div>
+ <div class="rf-ddm-strut"><img src="images/spacer.gif" width="1" height="1" alt="" border="0"/></div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="rf-ddm-sep"></div>
+ <div class="rf-ddm-itm rf-ddm-itm-dis">
+ <span class="rf-ddm-itm-ic"><img width="16" height="16" src="images/spacer.gif" alt="Menu item icon"></span>
+ testString 1.4
+ <div class="rf-ddm-nd"></div>
+ </div>
+ <div class="rf-ddm-itm rf-ddm-itm-unsel" onmouseover="this.className='rf-ddm-itm rf-ddm-itm-sel'" onmouseout="this.className='rf-ddm-itm rf-ddm-itm-unsel'">
+ <span class="rf-ddm-itm-ic"><img width="16" height="16" src="images/spacer.gif" alt="Menu item icon"></span>
+ <span class="rf-ddm-itm-lbl">testString 1.5</span>
+ </div>
+ </div>
+ <div class="rf-ddm-strut"><img src="images/spacer.gif" width="1" height="1" alt="" border="0"/></div>
+ </div>
+ </div>
+ </div>
+ </body>
+</html>
Added: management/design-4x/dropDownMenu-new/images/copy.gif
===================================================================
(Binary files differ)
Property changes on: management/design-4x/dropDownMenu-new/images/copy.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: management/design-4x/dropDownMenu-new/images/ico1.gif
===================================================================
(Binary files differ)
Property changes on: management/design-4x/dropDownMenu-new/images/ico1.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: management/design-4x/dropDownMenu-new/images/ico2.gif
===================================================================
(Binary files differ)
Property changes on: management/design-4x/dropDownMenu-new/images/ico2.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: management/design-4x/dropDownMenu-new/images/input_bg.png
===================================================================
(Binary files differ)
Property changes on: management/design-4x/dropDownMenu-new/images/input_bg.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: management/design-4x/dropDownMenu-new/images/menu_item_bg.gif
===================================================================
(Binary files differ)
Property changes on: management/design-4x/dropDownMenu-new/images/menu_item_bg.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: management/design-4x/dropDownMenu-new/images/menu_list_bg.gif
===================================================================
(Binary files differ)
Property changes on: management/design-4x/dropDownMenu-new/images/menu_list_bg.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: management/design-4x/dropDownMenu-new/images/node.gif
===================================================================
(Binary files differ)
Property changes on: management/design-4x/dropDownMenu-new/images/node.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: management/design-4x/dropDownMenu-new/images/spacer.gif
===================================================================
(Binary files differ)
Property changes on: management/design-4x/dropDownMenu-new/images/spacer.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
13 years, 6 months
JBoss Rich Faces SVN: r20120 - modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2010-11-19 08:34:14 -0500 (Fri, 19 Nov 2010)
New Revision: 20120
Modified:
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Attributes.java
Log:
* fixed a checkstyle violation
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Attributes.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Attributes.java 2010-11-19 13:09:29 UTC (rev 20119)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Attributes.java 2010-11-19 13:34:14 UTC (rev 20120)
@@ -71,12 +71,12 @@
private static final long serialVersionUID = -1L;
private static Logger logger = LoggerFactory.getLogger(Attributes.class);
+ private static Map<Class<?>, List<Attribute>> richfacesAttributes;
// K - name of a component attribute, V - value of the component attribute
private Map<String, Attribute> attributes;
// class object of managed bean
private Class<?> beanClass;
- private static Map<Class<?>, List<Attribute>> richfacesAttributes;
-
+
/**
* Constructor for class Attributes.
*
13 years, 6 months
JBoss Rich Faces SVN: r20119 - trunk/ui/input/ui/src/main/java/org/richfaces/renderkit.
by richfaces-svn-commits＠lists.jboss.org
Author: amarkhel
Date: 2010-11-19 08:09:29 -0500 (Fri, 19 Nov 2010)
New Revision: 20119
Modified:
trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java
Log:
RF-9630 Calendar component: disabled state support. Processing the disabled calendar icon was added.
Modified: trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java
===================================================================
--- trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2010-11-19 12:40:47 UTC (rev 20118)
+++ trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2010-11-19 13:09:29 UTC (rev 20119)
@@ -298,7 +298,7 @@
}
public String getButtonIcon(FacesContext facesContext, UIComponent component) {
- boolean disable = (Boolean)component.getAttributes().get("disabled");
+ boolean disable = (Boolean)component.getAttributes().get(OPTION_DISABLED);
String buttonIcon = (String)component.getAttributes().get("buttonIcon");
if (disable) {
buttonIcon = (String)component.getAttributes().get("buttonIconDisabled");
@@ -307,10 +307,9 @@
if(buttonIcon != null && buttonIcon.trim().length() != 0) {
buttonIcon = RenderKitUtils.getResourceURL(buttonIcon, facesContext);
} else {
- buttonIcon = disable ? CALENDAR_ICON_RESOURCE_NAME: CALENDAR_ICON_RESOURCE_NAME;
+ buttonIcon = disable ? CALENDAR_DISABLE_ICON_RESOURCE_NAME: CALENDAR_ICON_RESOURCE_NAME;
buttonIcon = RenderKitUtils.getResourcePath(facesContext, "org.richfaces.images",buttonIcon);
}
-
return buttonIcon;
}
13 years, 6 months
JBoss Rich Faces SVN: r20118 - trunk/ui/input/ui/src/main/java/org/richfaces/component.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2010-11-19 07:40:47 -0500 (Fri, 19 Nov 2010)
New Revision: 20118
Modified:
trunk/ui/input/ui/src/main/java/org/richfaces/component/AbstractInplaceInput.java
Log:
RF-9781
Modified: trunk/ui/input/ui/src/main/java/org/richfaces/component/AbstractInplaceInput.java
===================================================================
--- trunk/ui/input/ui/src/main/java/org/richfaces/component/AbstractInplaceInput.java 2010-11-19 12:00:16 UTC (rev 20117)
+++ trunk/ui/input/ui/src/main/java/org/richfaces/component/AbstractInplaceInput.java 2010-11-19 12:40:47 UTC (rev 20118)
@@ -104,7 +104,7 @@
public abstract String getOnkeypress();
@Attribute(events=@EventName("keyup"))
- public abstract String getOnkeypup();
+ public abstract String getOnkeyup();
@Attribute(events=@EventName("mousedown"))
public abstract String getOnmousedown();
@@ -149,7 +149,7 @@
public abstract String getOninputkeypress();
@Attribute(events=@EventName("inputkeyup"))
- public abstract String getOninputkeypup();
+ public abstract String getOninputkeyup();
@Attribute(events=@EventName("inputfocus"))
public abstract String getOninputfocus();
13 years, 6 months
JBoss Rich Faces SVN: r20117 - modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2010-11-19 07:00:16 -0500 (Fri, 19 Nov 2010)
New Revision: 20117
Modified:
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Attributes.java
Log:
* list of RichFaces attributes made static so that it will be loaded only once
Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Attributes.java
===================================================================
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Attributes.java 2010-11-19 11:49:05 UTC (rev 20116)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Attributes.java 2010-11-19 12:00:16 UTC (rev 20117)
@@ -75,7 +75,7 @@
private Map<String, Attribute> attributes;
// class object of managed bean
private Class<?> beanClass;
- private Map<Class<?>, List<Attribute>> richfacesAttributes;
+ private static Map<Class<?>, List<Attribute>> richfacesAttributes;
/**
* Constructor for class Attributes.
13 years, 6 months
JBoss Rich Faces SVN: r20116 - trunk/ui/input/ui/src/main/java/org/richfaces/component.
by richfaces-svn-commits＠lists.jboss.org
Author: amarkhel
Date: 2010-11-19 06:49:05 -0500 (Fri, 19 Nov 2010)
New Revision: 20116
Modified:
trunk/ui/input/ui/src/main/java/org/richfaces/component/AbstractCalendar.java
Log:
RF-9683 Calendar component: data model support. Calling getCurrentDate() was replaces by getCurrentDateOrDefault()
Modified: trunk/ui/input/ui/src/main/java/org/richfaces/component/AbstractCalendar.java
===================================================================
--- trunk/ui/input/ui/src/main/java/org/richfaces/component/AbstractCalendar.java 2010-11-19 11:20:55 UTC (rev 20115)
+++ trunk/ui/input/ui/src/main/java/org/richfaces/component/AbstractCalendar.java 2010-11-19 11:49:05 UTC (rev 20116)
@@ -494,9 +494,9 @@
if (Modes.AJAX.toString().equalsIgnoreCase(getMode())) {
dateRangeBegin = CalendarHelper.getAsDate(facesContext, this,
- getDefaultPreloadBegin((Date) getCurrentDate()));
+ getDefaultPreloadBegin((Date) getCurrentDateOrDefault()));
dateRangeEnd = CalendarHelper.getAsDate(facesContext, this,
- getDefaultPreloadEnd((Date) getCurrentDate()));
+ getDefaultPreloadEnd((Date) getCurrentDateOrDefault()));
} else {
dateRangeBegin = CalendarHelper.getAsDate(facesContext, this, getPreloadDateRangeBegin());
dateRangeEnd = CalendarHelper.getAsDate(facesContext, this, getPreloadDateRangeEnd());
13 years, 6 months