JBoss Tools SVN: r11526 - in trunk: jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: sdzmitrovich
Date: 2008-11-05 09:54:55 -0500 (Wed, 05 Nov 2008)
New Revision: 11526
Added:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/calendar/separator.gif
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/calendar/calendar.css
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesCalendarTemplate.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/HTML.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2829
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/calendar/calendar.css
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/calendar/calendar.css 2008-11-05 14:16:19 UTC (rev 11525)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/calendar/calendar.css 2008-11-05 14:54:55 UTC (rev 11526)
@@ -109,6 +109,8 @@
.rich-calendar-btn {
cursor: pointer;
+ padding: 2px 3px 2px 3px;
+ white-space: nowrap;
}
.rich-calendar-today {
@@ -149,6 +151,14 @@
}
.rich-calendar-footer-optional {
+ border-top: 1px solid;
+ border-right: 0 solid;
+ padding: 7px;
+ height: 22px;
+ font-weight: bold;
+ border-top-color: #C4C0B9;
+ border-right-color: #C4C0B9;
background: #F1EEE9;
- text-align: center;
+ font-size: 11px;
+ font-family: Arial, Verdana, sans-serif;
}
\ No newline at end of file
Added: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/calendar/separator.gif
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/calendar/separator.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesCalendarTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesCalendarTemplate.java 2008-11-05 14:16:19 UTC (rev 11525)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesCalendarTemplate.java 2008-11-05 14:54:55 UTC (rev 11526)
@@ -11,10 +11,11 @@
import java.text.DateFormatSymbols;
import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Calendar;
-import java.util.HashMap;
+import java.util.List;
import java.util.Locale;
-import java.util.Map;
import java.util.WeakHashMap;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -48,13 +49,14 @@
*/
public class RichFacesCalendarTemplate extends VpeAbstractTemplate implements
VpeToggableTemplate {
-
+
private static final WeakHashMap<Node, Object> expandedComboBoxes = new WeakHashMap<Node, Object>();
final static int COLUMN = 8;
final static String FILL_WIDTH = "100%"; //$NON-NLS-1$
final static int NUM_DAYS_IN_WEEK = 7;
final static int NUM_WEEK_ON_PAGE = 6;
+ final static int NUM_MONTHS = 12;
final static int CALENDAR_WIDTH = 200;
final static int CALENDAR_INPUT_WIDTH = CALENDAR_WIDTH - 20;
@@ -63,14 +65,9 @@
final static int CALENDAR_BUTTON_WIDTH = 80;
static final String DEFAULT_DATE_PATTERN = "MMM dd,yyyy"; //$NON-NLS-1$
- static final String VPE_USER_TOGGLE_ID_ATTR = "vpe-user-toggle-id"; //$NON-NLS-1$
/* rich:calendar attributes */
- static final String ATTR_ENABLE_MANUAL_INPUT = "enableManualInput"; //$NON-NLS-1$
-
- static final String ATTR_TODAY_CONTROL_MODE = "todayControlMode"; //$NON-NLS-1$
-
/* CSS classes */
static final String CSS_R_C_INPUT = "rich-calendar-input"; //$NON-NLS-1$
static final String CSS_R_C_BUTTON = "rich-calendar-button"; //$NON-NLS-1$
@@ -115,13 +112,8 @@
private static final String DIRECTIONS_BOTTOM_LEFT = "bottom-left"; //$NON-NLS-1$
private static final String DIRECTIONS_BOTTOM_RIGHT = "bottom-right"; //$NON-NLS-1$
- /* styles for direction table cells */
- private static final String STYLE_TOP_LEFT = "vertical-align: bottom; text-align: right;"; //$NON-NLS-1$
- private static final String STYLE_TOP_RIGHT = "vertical-align: bottom; text-align: left;"; //$NON-NLS-1$
- private static final String STYLE_BOTTOM_LEFT = "vertical-align: top; text-align: right;"; //$NON-NLS-1$
- private static final String STYLE_BOTTOM_RIGHT = "vertical-align: top; text-align: left;"; //$NON-NLS-1$
-
final static String DIRECTION_PATTERN = "(top|bottom)-(left|right)"; //$NON-NLS-1$
+ final static String UNDEFINED = "undefined"; //$NON-NLS-1$
final static int DEFAULT_CELL_WIDTH = 25;
final static int DEFAULT_CELL_HEIGHT = 22;
@@ -131,14 +123,6 @@
final static String LEFT = "left"; //$NON-NLS-1$
final static String HIDDEN = "hidden"; //$NON-NLS-1$
- static Map<String, int[]> DIRECTIONS = new HashMap<String, int[]>(4);
- static {
- DIRECTIONS.put(DIRECTIONS_TOP_LEFT, new int[] { -1, -1 });
- DIRECTIONS.put(DIRECTIONS_TOP_RIGHT, new int[] { -1, 1 });
- DIRECTIONS.put(DIRECTIONS_BOTTOM_LEFT, new int[] { 1, -1 });
- DIRECTIONS.put(DIRECTIONS_BOTTOM_RIGHT, new int[] { 1, 1 });
- }
-
/*
* ++++++++++++++++++++++++++++++++++++++++++++++++++++ NEW FIELDS
*/
@@ -153,11 +137,18 @@
static final String ATTR_SHOW_APPLY_BUTTON = "showApplyButton"; //$NON-NLS-1$
static final String ATTR_DATE_PATTERN = "datePattern"; //$NON-NLS-1$
static final String ATTR_FIRST_WEEK_DAY = "firstWeekDay"; //$NON-NLS-1$
+ static final String ATTR_WEEK_DAY_LABELS_SHORT = "weekDayLabelsShort"; //$NON-NLS-1$
+ static final String ATTR_MONTH_LABELS = "monthLabels"; //$NON-NLS-1$
+ static final String ATTR_ENABLE_MANUAL_INPUT = "enableManualInput"; //$NON-NLS-1$
+ static final String ATTR_TODAY_CONTROL_MODE = "todayControlMode"; //$NON-NLS-1$
final private static String DEFAULT_INPUT_STYLE = "vertical-align: middle;";//$NON-NLS-1$
+ final private static String POSITION_RELATIVE_STYLE = "position: relative;";//$NON-NLS-1$
+ final private static String POSITION_ABSOLUTE_STYLE = "position: absolute;";//$NON-NLS-1$
final private static String STYLE_PATH = "calendar/calendar.css"; //$NON-NLS-1$
final private static String DEFAULT_BUTTON_ICON = "calendar/calendar.gif"; //$NON-NLS-1$
final private static String DEFAULT_BUTTON_ICON_DISABLED = "calendar/disabled_button.gif"; //$NON-NLS-1$
+ final private static String SPARATOR_IMG = "calendar/separator.gif"; //$NON-NLS-1$
final private static String DEFAULT_BUTTON_STYLE = "vertical-align: middle;";//$NON-NLS-1$
final private static String NEXT_MONTH_CONTROL = ">";//$NON-NLS-1$
@@ -167,7 +158,6 @@
final private static String APPLY_CONTROL = "Apply"; //$NON-NLS-1$
final private static String TODAY_CONTROL = "Today"; //$NON-NLS-1$
final private static String CLOSE_CONTROL = "X"; //$NON-NLS-1$
- final private static String VERTICAL_SEPARATOR = "|"; //$NON-NLS-1$
private int tableWidth;
private int tableHeight;
@@ -214,10 +204,6 @@
private String datePattern;
- private String todayControlMode;
-
- private String enableManualInput;
-
/**
* Instantiates a new rich faces calendar template.
*/
@@ -326,28 +312,21 @@
creationData, headerFacet, true);
} else {
- String[] defaultHeaderContent = popup ? new String[] {
- PREVIOUS_YEAR_CONTROL, PREVIOUS_MONTH_CONTROL,
- currentMonthControl, NEXT_MONTH_CONTROL,
- NEXT_YEAR_CONTROL, CLOSE_CONTROL } : new String[] {
- PREVIOUS_YEAR_CONTROL, PREVIOUS_MONTH_CONTROL,
- currentMonthControl, NEXT_MONTH_CONTROL,
- NEXT_YEAR_CONTROL };
+ List<Cell> headerContent = new ArrayList<Cell>();
+ headerContent
+ .add(new Cell(PREVIOUS_YEAR_CONTROL, CSS_R_C_TOOL));
+ headerContent
+ .add(new Cell(PREVIOUS_MONTH_CONTROL, CSS_R_C_TOOL));
+ headerContent.add(new Cell(currentMonthControl, CSS_R_C_MONTH));
+ headerContent.add(new Cell(NEXT_MONTH_CONTROL, CSS_R_C_TOOL));
+ headerContent.add(new Cell(NEXT_YEAR_CONTROL, CSS_R_C_TOOL));
+ if (popup)
+ headerContent.add(new Cell(CLOSE_CONTROL, CSS_R_C_TOOL
+ + Constants.WHITE_SPACE + CSS_R_C_TOOL_CLOSE, true,
+ true));
- String[] defaultHeaderContentStyles = popup ? new String[] {
- CSS_R_C_TOOL,
- CSS_R_C_TOOL,
- CSS_R_C_MONTH,
- CSS_R_C_TOOL,
- CSS_R_C_TOOL,
- CSS_R_C_TOOL + Constants.WHITE_SPACE
- + CSS_R_C_TOOL_CLOSE } : new String[] {
- CSS_R_C_TOOL, CSS_R_C_TOOL, CSS_R_C_MONTH,
- CSS_R_C_TOOL, CSS_R_C_TOOL };
-
- // header = createDefaultCalendarHeader(visualDocument);
header = createHeaderBlock(visualDocument, CSS_R_C_HEADER,
- defaultHeaderContent, defaultHeaderContentStyles);
+ headerContent);
}
}
if (showFooter) {
@@ -359,26 +338,17 @@
creationData, footerFacet, false);
} else {
- String[] defaultFooterContent;
- String[] defaultFooterContentStyles;
- if (popup) {
+ List<Cell> footerContent = new ArrayList<Cell>();
+ if (showTodayControl)
+ footerContent.add(new Cell(TODAY_CONTROL,
+ CSS_R_C_TOOLFOOTER,showTodayControl
+ && showApplyButton ));
+ if (popup && showApplyButton)
+ footerContent.add(new Cell(APPLY_CONTROL,
+ CSS_R_C_TOOLFOOTER, false, true));
- defaultFooterContent = new String[] {
- showTodayControl ? TODAY_CONTROL : Constants.EMPTY,
- showApplyButton ? APPLY_CONTROL : Constants.EMPTY };
- defaultFooterContentStyles = new String[] {
- CSS_R_C_TOOLFOOTER, CSS_R_C_TOOLFOOTER };
-
- } else {
-
- defaultFooterContent = new String[] { TODAY_CONTROL };
- defaultFooterContentStyles = new String[] { CSS_R_C_TOOLFOOTER };
-
- }
-
- // footer = createDefaultCalendarFooter(visualDocument);
footer = createFooterBlock(visualDocument, CSS_R_C_FOOTER,
- defaultFooterContent, defaultFooterContentStyles);
+ footerContent);
}
}
@@ -434,116 +404,6 @@
* @param visualDocument
* @return Node of the visual tree.
*/
- // private nsIDOMElement createDefaultCalendarHeader(
- // nsIDOMDocument visualDocument) {
- //
- // nsIDOMElement tr = visualDocument.createElement(HTML.TAG_TR);
- // nsIDOMElement td = visualDocument.createElement(HTML.TAG_TD);
- // td.setAttribute(HTML.ATTR_COLSPAN, Constants.EMPTY + COLUMN);
- //
- // nsIDOMElement table = visualDocument.createElement(HTML.TAG_TABLE);
- // table.setAttribute(HTML.ATTR_CELLPADDING, "0"); //$NON-NLS-1$
- // table.setAttribute(HTML.ATTR_CELLSPACING, "0"); //$NON-NLS-1$
- // table.setAttribute(HTML.ATTR_BORDER, "0"); //$NON-NLS-1$
- // table.setAttribute(HTML.ATTR_WIDTH, FILL_WIDTH);
- //
- // nsIDOMElement tbody = visualDocument.createElement(HTML.TAG_TBODY);
- //
- // nsIDOMElement tr1 = visualDocument.createElement(HTML.TAG_TR);
- // tr1.setAttribute(HTML.ATTR_CLASS, CSS_R_C_HEADER);
- //
- // for (int i = 0; i < defaultHeaderContent.length; i++) {
- // nsIDOMElement td1 = visualDocument.createElement(HTML.TAG_TD);
- // td1.setAttribute(HTML.ATTR_CLASS, i == 2 ? CSS_R_C_MONTH
- // : CSS_R_C_TOOL);
- //
- // // close tool
- // if (i == 5) {
- // td1.setAttribute(VPE_USER_TOGGLE_ID_ATTR, "0"); //$NON-NLS-1$
- // td1.setAttribute(HTML.ATTR_STYLE, "cursor: pointer;"); //$NON-NLS-1$
- // }
- //
- // nsIDOMText text1 = visualDocument
- // .createTextNode(defaultHeaderContent[i]);
- // td1.appendChild(text1);
- // tr1.appendChild(td1);
- // }
- //
- // tbody.appendChild(tr1);
- // table.appendChild(tbody);
- // td.appendChild(table);
- // tr.appendChild(td);
- // return tr;
- // }
- /**
- * Creates the calendar footer.
- *
- * @param visualDocument
- * the visual document
- *
- * @return the ns idom element
- */
- private nsIDOMElement createDefaultCalendarFooter(
- nsIDOMDocument visualDocument) {
- nsIDOMElement tr = visualDocument.createElement(HTML.TAG_TR);
- nsIDOMElement td = visualDocument.createElement(HTML.TAG_TD);
- td.setAttribute(HTML.ATTR_COLSPAN, Constants.EMPTY + COLUMN);
- nsIDOMElement table = visualDocument.createElement(HTML.TAG_TABLE);
- table.setAttribute(HTML.ATTR_CELLSPACING, "0"); //$NON-NLS-1$
- table.setAttribute(HTML.ATTR_CELLPADDING, "0"); //$NON-NLS-1$
- table.setAttribute(HTML.ATTR_BORDER, "0"); //$NON-NLS-1$
- table.setAttribute(HTML.ATTR_WIDTH, FILL_WIDTH);
-
- nsIDOMElement tr1 = visualDocument.createElement(HTML.TAG_TR);
- tr1.setAttribute(HTML.ATTR_CLASS, CSS_R_C_FOOTER);
-
- nsIDOMElement td1 = visualDocument.createElement(HTML.TAG_TD);
- td1.setAttribute(HTML.ATTR_CLASS, CSS_R_C_TOOLFOOTER);
-
- nsIDOMText text1 = visualDocument.createTextNode(currentDayControl);
- td1.appendChild(text1);
- tr1.appendChild(td1);
-
- nsIDOMElement td2 = visualDocument.createElement(HTML.TAG_TD);
- td2.setAttribute(HTML.ATTR_WIDTH, FILL_WIDTH);
- tr1.appendChild(td2);
-
- nsIDOMElement td3 = visualDocument.createElement(HTML.TAG_TD);
- td3.setAttribute(HTML.ATTR_WIDTH, FILL_WIDTH);
- td3.setAttribute(HTML.ATTR_CLASS, CSS_R_C_TOOLFOOTER);
- td3.setAttribute(HTML.ATTR_ALIGN, HTML.VALUE_ALIGN_RIGHT);
-
- String nodeText;
- // if (showApplyButton) {
- // if ("hidden".equalsIgnoreCase(todayControlMode)) { //$NON-NLS-1$
- // nodeText = Constants.EMPTY;
- // } else {
- // nodeText = TODAY;
- // }
- // } else {
- if ("hidden".equalsIgnoreCase(todayControlMode)) { //$NON-NLS-1$
- nodeText = APPLY_CONTROL;
- } else {
- nodeText = TODAY_CONTROL + VERTICAL_SEPARATOR + APPLY_CONTROL;
- }
- // }
- nsIDOMText text3 = visualDocument.createTextNode(nodeText);
-
- td3.appendChild(text3);
- tr1.appendChild(td3);
-
- table.appendChild(tr1);
- td.appendChild(table);
- tr.appendChild(td);
-
- return tr;
- }
-
- /**
- *
- * @param visualDocument
- * @return Node of the visual tree.
- */
private nsIDOMElement createCalendarBody(nsIDOMDocument visualDocument) {
nsIDOMElement tbody = visualDocument.createElement(HTML.TAG_TBODY);
@@ -651,14 +511,6 @@
+ Constants.COLON + cellWidth
+ "px;" + HTML.STYLE_PARAMETER_HEIGHT //$NON-NLS-1$
+ Constants.COLON + cellHeight + "px;"); //$NON-NLS-1$
- // } else if (attrPresents(cellWidth)) {
- // td.setAttribute(HTML.ATTR_STYLE, HTML.STYLE_PARAMETER_WIDTH
- // + Constants.COLON + cellWidth + "px;"); //$NON-NLS-1$
- // } else if (attrPresents(cellHeight)) {
- // td.setAttribute(HTML.ATTR_STYLE,
- // HTML.STYLE_PARAMETER_HEIGHT + Constants.COLON
- // + cellHeight + "px;"); //$NON-NLS-1$
- // }
nsIDOMText text = visualDocument.createTextNode(Constants.EMPTY
+ calendar.get(Calendar.DAY_OF_MONTH));
@@ -875,10 +727,9 @@
direction = getDirection(sourceElement, RichFaces.ATTR_DIRECTION,
DIRECTIONS_BOTTOM_RIGHT);
- //zindex
- zindex = parseNumberAttribute(sourceElement,
- RichFaces.ATTR_ZINDEX, 3);
-
+ // zindex
+ zindex = parseNumberAttribute(sourceElement, RichFaces.ATTR_ZINDEX, 3);
+
// horizontalOffset
horizontalOffset = parseNumberAttribute(sourceElement,
RichFaces.ATTR_HORIZONTAL_OFFSET, 0);
@@ -887,37 +738,18 @@
verticalOffset = parseNumberAttribute(sourceElement,
RichFaces.ATTR_VERTICAL_OFFSET, 0);
- // todayControlMode
- todayControlMode = sourceElement.getAttribute(ATTR_TODAY_CONTROL_MODE);
-
- // enableManualInput
- enableManualInput = sourceElement
- .getAttribute(ATTR_ENABLE_MANUAL_INPUT);
-
}
- /**
- * Checks is attribute presents.
- *
- * @param attr
- * the attribute
- *
- * @return true, if successful
- */
- private boolean attrPresents(String attr) {
- return ((null != attr) && (attr.length() != 0));
- }
-
public void stopToggling(Node sourceNode) {
}
public void toggle(VpeVisualDomBuilder builder, Node sourceNode,
String toggleId) {
- if (isExpanded(sourceNode)) {
- expandedComboBoxes.remove(sourceNode);
- } else {
- expandedComboBoxes.put(sourceNode, null);
- }
+ if (isExpanded(sourceNode)) {
+ expandedComboBoxes.remove(sourceNode);
+ } else {
+ expandedComboBoxes.put(sourceNode, null);
+ }
}
private boolean isExpanded(Node sourceNode) {
@@ -982,19 +814,19 @@
}
- button.setAttribute(HTML.ATTR_STYLE, DEFAULT_BUTTON_STYLE
- + ";position:relative;");
+ button.setAttribute(HTML.ATTR_STYLE, DEFAULT_BUTTON_STYLE);
button.setAttribute(HTML.ATTR_CLASS, CSS_R_C_BUTTON
+ Constants.WHITE_SPACE + buttonClass);
- button.setAttribute(VpeVisualDomBuilder.VPE_USER_TOGGLE_ID, "true");
+ button.setAttribute(VpeVisualDomBuilder.VPE_USER_TOGGLE_ID,
+ Constants.TRUE);
popupCalendar.appendChild(button);
if (isExpanded(sourceElement)) {
nsIDOMElement wrapper = visualDocument
.createElement(HTML.ATTR_SPAN);
- wrapper.setAttribute(HTML.ATTR_STYLE, "position: relative;");
+ wrapper.setAttribute(HTML.ATTR_STYLE, POSITION_RELATIVE_STYLE);
nsIDOMElement calendar = createCalendar(visualDocument,
creationData, sourceElement);
@@ -1006,14 +838,16 @@
int left = (direction.isLeft() ? -1 : 1)
* ((direction.isLeft() ? tableWidth : 0) + horizontalOffset);
- calendar.setAttribute(HTML.ATTR_STYLE,
- "position: absolute; z-index:" + zindex
- + Constants.SEMICOLON + "top:" + top
- + Constants.PIXEL + Constants.SEMICOLON + " left:"
- + left + Constants.PIXEL + Constants.SEMICOLON
- + " width:" + tableWidth + Constants.PIXEL
- + Constants.SEMICOLON
- + calendar.getAttribute(HTML.ATTR_STYLE));
+ calendar.setAttribute(HTML.ATTR_STYLE, POSITION_ABSOLUTE_STYLE
+ + HTML.STYLE_PARAMETER_ZINDEX + Constants.COLON + zindex
+ + Constants.SEMICOLON + HTML.STYLE_PARAMETER_TOP
+ + Constants.COLON + top + Constants.PIXEL
+ + Constants.SEMICOLON + HTML.STYLE_PARAMETER_LEFT
+ + Constants.COLON + left + Constants.PIXEL
+ + Constants.SEMICOLON + HTML.STYLE_PARAMETER_WIDTH
+ + Constants.COLON + tableWidth + Constants.PIXEL
+ + Constants.SEMICOLON
+ + calendar.getAttribute(HTML.ATTR_STYLE));
wrapper.appendChild(calendar);
@@ -1153,13 +987,27 @@
* @return
*/
private String[] getWeekDays(Element sourceElement, Locale locale) {
- DateFormatSymbols formatSymbols = new DateFormatSymbols(locale);
String[] days = new String[NUM_DAYS_IN_WEEK];
+ if (sourceElement.hasAttribute(ATTR_WEEK_DAY_LABELS_SHORT)) {
- System.arraycopy(formatSymbols.getShortWeekdays(), 1, days, 0,
- NUM_DAYS_IN_WEEK);
+ String attrValue = sourceElement
+ .getAttribute(ATTR_WEEK_DAY_LABELS_SHORT);
+ String[] parsedDays = attrValue.split(Constants.COMMA);
+ System.arraycopy(parsedDays, 0, days, 0, parsedDays.length);
+ if (parsedDays.length < NUM_DAYS_IN_WEEK) {
+
+ Arrays.fill(days, parsedDays.length, days.length - 1,
+ Constants.EMPTY);
+ }
+
+ } else {
+
+ DateFormatSymbols formatSymbols = new DateFormatSymbols(locale);
+ System.arraycopy(formatSymbols.getShortWeekdays(), 1, days, 0,
+ NUM_DAYS_IN_WEEK);
+ }
return days;
}
@@ -1168,9 +1016,27 @@
* @return
*/
private String[] getMonths(Element sourceElement, Locale locale) {
+ String[] months;
+ if (sourceElement.hasAttribute(ATTR_MONTH_LABELS)) {
- DateFormatSymbols formatSymbols = new DateFormatSymbols(locale);
- return formatSymbols.getMonths();
+ months = new String[NUM_MONTHS];
+
+ String attrValue = sourceElement.getAttribute(ATTR_MONTH_LABELS);
+ String[] parsedMonths = attrValue.split(Constants.COMMA);
+
+ System.arraycopy(parsedMonths, 0, months, 0, parsedMonths.length);
+
+ if (parsedMonths.length < NUM_MONTHS) {
+
+ Arrays.fill(months, parsedMonths.length, months.length - 1,
+ UNDEFINED);
+ }
+
+ } else {
+ DateFormatSymbols formatSymbols = new DateFormatSymbols(locale);
+ months = formatSymbols.getMonths();
+ }
+ return months;
}
/**
@@ -1182,8 +1048,7 @@
* @return
*/
private nsIDOMElement createHeaderBlock(nsIDOMDocument visualDocument,
- String blockClass, String[] arrayContent,
- String[] arrayContentStyles) {
+ String blockClass, List<Cell> content) {
nsIDOMElement blockTr = visualDocument.createElement(HTML.TAG_TR);
nsIDOMElement blockTd = visualDocument.createElement(HTML.TAG_TD);
@@ -1196,23 +1061,36 @@
blockTable.setAttribute(HTML.ATTR_CELLSPACING, "0"); //$NON-NLS-1$
blockTable.setAttribute(HTML.ATTR_BORDER, "0"); //$NON-NLS-1$
blockTable.setAttribute(HTML.ATTR_WIDTH, FILL_WIDTH);
- // blockTable.setAttribute(HTML.ATTR_STYLE, "display:inline-block;");
nsIDOMElement tbody = visualDocument.createElement(HTML.TAG_TBODY);
nsIDOMElement tr = visualDocument.createElement(HTML.TAG_TR);
- for (int i = 0; i < arrayContent.length; i++) {
+ for (Cell cell : content) {
+
nsIDOMElement td = visualDocument.createElement(HTML.TAG_TD);
- td.setAttribute(HTML.ATTR_CLASS, arrayContentStyles[i]);
+ td.setAttribute(HTML.ATTR_CLASS, cell.getCellClass());
nsIDOMElement div = visualDocument.createElement(HTML.TAG_DIV);
div.setAttribute(HTML.ATTR_CLASS, CSS_R_C_TOOL_BTN);
- nsIDOMText text1 = visualDocument.createTextNode(arrayContent[i]);
+ nsIDOMText text1 = visualDocument
+ .createTextNode(cell.getCellText());
div.appendChild(text1);
- div.setAttribute(VpeVisualDomBuilder.VPE_USER_TOGGLE_ID, "true");
+
+ if (cell.isToggle()) {
+ div.setAttribute(VpeVisualDomBuilder.VPE_USER_TOGGLE_ID,
+ Constants.TRUE);
+ }
+
+ if (cell.isSeparate()) {
+
+ td.setAttribute(HTML.ATTR_STYLE, ComponentUtil
+ .getBackgoundImgStyle(SPARATOR_IMG));
+
+ }
+
td.appendChild(div);
tr.appendChild(td);
}
@@ -1234,8 +1112,7 @@
* @return
*/
private nsIDOMElement createFooterBlock(nsIDOMDocument visualDocument,
- String blockClass, String[] arrayContent,
- String[] arrayContentStyles) {
+ String blockClass, List<Cell> content) {
nsIDOMElement blockTr = visualDocument.createElement(HTML.TAG_TR);
nsIDOMElement blockTd = visualDocument.createElement(HTML.TAG_TD);
@@ -1247,7 +1124,6 @@
blockTable.setAttribute(HTML.ATTR_CELLSPACING, "0"); //$NON-NLS-1$
blockTable.setAttribute(HTML.ATTR_BORDER, "0"); //$NON-NLS-1$
blockTable.setAttribute(HTML.ATTR_WIDTH, FILL_WIDTH);
- // blockTable.setAttribute(HTML.ATTR_STYLE, "display:inline;");
nsIDOMElement tbody = visualDocument.createElement(HTML.TAG_TBODY);
nsIDOMElement tr = visualDocument.createElement(HTML.TAG_TR);
@@ -1256,15 +1132,28 @@
fillingTd.setAttribute(HTML.ATTR_WIDTH, FILL_WIDTH);
tr.appendChild(fillingTd);
- for (int i = 0; i < arrayContent.length; i++) {
+ for (Cell cell : content) {
+
nsIDOMElement td = visualDocument.createElement(HTML.TAG_TD);
- td.setAttribute(HTML.ATTR_CLASS, arrayContentStyles[i]);
+ td.setAttribute(HTML.ATTR_CLASS, cell.getCellClass());
nsIDOMElement div = visualDocument.createElement(HTML.TAG_DIV);
div.setAttribute(HTML.ATTR_CLASS, CSS_R_C_TOOL_BTN);
- nsIDOMText text1 = visualDocument.createTextNode(arrayContent[i]);
+ nsIDOMText text = visualDocument.createTextNode(cell.getCellText());
- div.appendChild(text1);
+ if (cell.isToggle()) {
+ div.setAttribute(VpeVisualDomBuilder.VPE_USER_TOGGLE_ID,
+ Constants.TRUE);
+ }
+
+ if (cell.isSeparate()) {
+
+ td.setAttribute(HTML.ATTR_STYLE, ComponentUtil
+ .getBackgoundImgStyle(SPARATOR_IMG));
+
+ }
+
+ div.appendChild(text);
td.appendChild(div);
tr.appendChild(td);
}
@@ -1326,4 +1215,70 @@
}
+ class Cell {
+
+ private String cellText;
+
+ private String cellClass;
+
+ private boolean separate;
+
+ private boolean toggle;
+
+ public boolean isToggle() {
+ return toggle;
+ }
+
+ public void setToggle(boolean toggle) {
+ this.toggle = toggle;
+ }
+
+ public Cell(String cellText, String cellClass) {
+ this.cellText = cellText;
+ this.cellClass = cellClass;
+ this.separate = false;
+ this.toggle = false;
+ }
+
+ public Cell(String cellText, String cellClass, boolean separate) {
+ this.cellText = cellText;
+ this.cellClass = cellClass;
+ this.separate = separate;
+ this.toggle = false;
+ }
+
+ public Cell(String cellText, String cellClass, boolean separate,
+ boolean toggle) {
+ this.cellText = cellText;
+ this.cellClass = cellClass;
+ this.separate = separate;
+ this.toggle = toggle;
+ }
+
+ public String getCellText() {
+ return cellText;
+ }
+
+ public void setCellText(String cellText) {
+ this.cellText = cellText;
+ }
+
+ public String getCellClass() {
+ return cellClass;
+ }
+
+ public void setCellClass(String cellClass) {
+ this.cellClass = cellClass;
+ }
+
+ public boolean isSeparate() {
+ return separate;
+ }
+
+ public void setSeparate(boolean separate) {
+ this.separate = separate;
+ }
+
+ }
+
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/HTML.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/HTML.java 2008-11-05 14:16:19 UTC (rev 11525)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/HTML.java 2008-11-05 14:54:55 UTC (rev 11526)
@@ -106,7 +106,10 @@
public static final String VALUE_ALIGN_CENTER = "center"; //$NON-NLS-1$
public static final String STYLE_PARAMETER_WIDTH = "width"; //$NON-NLS-1$
+ public static final String STYLE_PARAMETER_TOP = "top"; //$NON-NLS-1$
+ public static final String STYLE_PARAMETER_LEFT = "left"; //$NON-NLS-1$
public static final String STYLE_PARAMETER_HEIGHT = "height"; //$NON-NLS-1$
public static final String STYLE_PARAMETER_BACKGROUND_IMAGE = "background-image"; //$NON-NLS-1$
public static final String STYLE_PARAMETER_MAX_HEIGHT = "max-height"; //$NON-NLS-1$
+ public static final String STYLE_PARAMETER_ZINDEX = "z-index"; //$NON-NLS-1$
}
\ No newline at end of file
16 years, 2 months
JBoss Tools SVN: r11525 - trunk/seam/plugins/org.jboss.tools.seam.pages.xml/resources/meta.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-11-05 09:16:19 -0500 (Wed, 05 Nov 2008)
New Revision: 11525
Modified:
trunk/seam/plugins/org.jboss.tools.seam.pages.xml/resources/meta/seam-pages.meta
Log:
JBIDE-3022
Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/resources/meta/seam-pages.meta
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/resources/meta/seam-pages.meta 2008-11-05 13:00:22 UTC (rev 11524)
+++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/resources/meta/seam-pages.meta 2008-11-05 14:16:19 UTC (rev 11525)
@@ -68,6 +68,7 @@
<XChildEntity name="SeamPageIn"/>
<XChildEntity name="SeamPageAction"/>
<XChildEntity name="SeamPageNavigation12"/>
+ <XChildEntity name="SeamPageNavigationRule12"/>
</XChildrenEntities>
<XEntityRenderer>
<ICONS>
@@ -206,6 +207,7 @@
<XChildEntity maxCount="1" name="SeamPageRaiseEvent20"/>
<XChildEntity name="SeamPageAction"/>
<XChildEntity name="SeamPageNavigation20"/>
+ <XChildEntity name="SeamPageNavigationRule20"/>
</XChildrenEntities>
<XEntityRenderer>
<ICONS>
@@ -320,7 +322,7 @@
<XEntityRenderer/>
<XModelAttributes/>
<XActionItem kind="list">
- <XActionItemReference entity="SeamPage12" name="CreateActions" path="CreateActions"/>
+ <XActionItemReference entity="SeamPage20" name="CreateActions" path="CreateActions"/>
<XActionItemReference entity="SeamPage12" name="Properties" path="Properties"/>
<XActionItemReference entity="SeamPage12" name="VerifyActions" path="VerifyActions"/>
</XActionItem>
16 years, 2 months
JBoss Tools SVN: r11524 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2008-11-05 08:00:22 -0500 (Wed, 05 Nov 2008)
New Revision: 11524
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/KeyEventManager.java
Log:
Code adjustment
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/KeyEventManager.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/KeyEventManager.java 2008-11-05 12:59:52 UTC (rev 11523)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/KeyEventManager.java 2008-11-05 13:00:22 UTC (rev 11524)
@@ -401,7 +401,7 @@
if ((sourceElement != null) && (attributeName != null)) {
sourceElement.setAttribute(attributeName, value != null ? value
- : ""); //$NON-NLS-1$
+ : EMPTY_STRING);
return sourceElement.getAttributeNode(attributeName);
}
16 years, 2 months
JBoss Tools SVN: r11523 - trunk/vpe/plugins/org.jboss.tools.vpe.html/src/org/jboss/tools/vpe/html/template.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2008-11-05 07:59:52 -0500 (Wed, 05 Nov 2008)
New Revision: 11523
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.html/src/org/jboss/tools/vpe/html/template/HtmlTextTemplate.java
Log:
JBIDE-3070, text node from message bundles, or el should be not editable
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.html/src/org/jboss/tools/vpe/html/template/HtmlTextTemplate.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.html/src/org/jboss/tools/vpe/html/template/HtmlTextTemplate.java 2008-11-05 12:13:29 UTC (rev 11522)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.html/src/org/jboss/tools/vpe/html/template/HtmlTextTemplate.java 2008-11-05 12:59:52 UTC (rev 11523)
@@ -61,11 +61,31 @@
NodeData result;
VpeNodeMapping nodeMapping = domMapping.getNearNodeMapping(node);
+
+ nsIDOMNode textNode;
if(node.getNodeType()==nsIDOMNode.ELEMENT_NODE) {
- result = new NodeData(nodeMapping.getSourceNode(),node.getFirstChild(),true);
+ textNode = node.getFirstChild();
} else {
- result = new NodeData(nodeMapping.getSourceNode(),node,true);
+ textNode = node;
}
+
+ String sourceNodeValue=null;
+ if((nodeMapping.getSourceNode()!=null) &&
+ (nodeMapping.getSourceNode().getNodeType()==Node.TEXT_NODE)) {
+ sourceNodeValue=nodeMapping.getSourceNode().getNodeValue();
+ }
+ String visualNodeValue=null;
+ if((textNode!=null)&&
+ (textNode.getNodeType()==nsIDOMNode.TEXT_NODE)) {
+ visualNodeValue = textNode.getNodeValue();
+ }
+
+ boolean editable =false;
+ if(sourceNodeValue!=null && visualNodeValue!=null) {
+ editable =sourceNodeValue.trim().equals(visualNodeValue.trim());
+ }
+
+ result = new NodeData(nodeMapping.getSourceNode(),textNode,editable);
return result;
}
16 years, 2 months
JBoss Tools SVN: r11522 - in trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor: template/expression and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2008-11-05 07:13:29 -0500 (Wed, 05 Nov 2008)
New Revision: 11522
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/AbstractActionManager.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionHref.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionSrc.java
Log:
code adjustment, removing suspect copy past
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/AbstractActionManager.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/AbstractActionManager.java 2008-11-05 12:01:10 UTC (rev 11521)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/AbstractActionManager.java 2008-11-05 12:13:29 UTC (rev 11522)
@@ -568,97 +568,4 @@
return model;
}
- /**
- * @depracated
- */
- public class InsertAction extends NodeAction {
- protected String description;
-
- protected int nodeType;
-
- protected int index;
-
- protected Node parent;
-
- public InsertAction(int nodeType, Node parent, int index) {
- this.nodeType = nodeType;
- this.index = index;
- this.parent = parent;
- switch (nodeType) {
- case Node.COMMENT_NODE: {
- description = XMLCommonResources.getInstance().getString(
- "_UI_MENU_COMMENT"); //$NON-NLS-1$
- break;
- }
- case Node.PROCESSING_INSTRUCTION_NODE: {
- description = XMLCommonResources.getInstance().getString(
- "_UI_MENU_PROCESSING_INSTRUCTION"); //$NON-NLS-1$
- break;
- }
- case Node.CDATA_SECTION_NODE: {
- description = XMLCommonResources.getInstance().getString(
- "_UI_MENU_CDATA_SECTION"); //$NON-NLS-1$
- break;
- }
- case Node.TEXT_NODE: {
- description = XMLCommonResources.getInstance().getString(
- "_UI_MENU_PCDATA"); //$NON-NLS-1$
- break;
- }
- }
- setText(description);
- }
-
- public InsertAction(int nodeType, Node parent, int index, String title) {
- this.nodeType = nodeType;
- this.index = index;
- this.parent = parent;
- description = title;
- setText(description);
- }
-
- public String getUndoDescription() {
- return XMLCommonResources.getInstance().getString("_UI_MENU_ADD") + " " + description; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- public void run() {
- beginNodeAction(this);
-
- Document document = parent.getNodeType() == Node.DOCUMENT_NODE ? (Document) parent
- : parent.getOwnerDocument();
- Node newChildNode = null;
- boolean format = true;
- switch (nodeType) {
- case Node.COMMENT_NODE: {
- newChildNode = document.createComment(XMLCommonResources
- .getInstance().getString("_UI_COMMENT_VALUE")); //$NON-NLS-1$
- break;
- }
- case Node.PROCESSING_INSTRUCTION_NODE: {
- newChildNode = document
- .createProcessingInstruction(
- XMLCommonResources.getInstance().getString(
- "_UI_PI_TARGET_VALUE"), XMLCommonResources.getInstance().getString("_UI_PI_DATA_VALUE")); //$NON-NLS-1$ //$NON-NLS-2$
- break;
- }
- case Node.CDATA_SECTION_NODE: {
- newChildNode = document.createCDATASection(""); //$NON-NLS-1$
- break;
- }
- case Node.TEXT_NODE: {
- format = false;
- newChildNode = document.createTextNode(parent.getNodeName());
- break;
- }
- }
-
- if (newChildNode != null) {
- List list = new Vector(1);
- list.add(newChildNode);
- insertNodesAtIndex(2, parent, list, index, format);
- }
-
- endNodeAction(this);
- }
- }
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionHref.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionHref.java 2008-11-05 12:01:10 UTC (rev 11521)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionHref.java 2008-11-05 12:13:29 UTC (rev 11522)
@@ -19,6 +19,7 @@
import org.w3c.dom.Node;
import org.jboss.tools.vpe.editor.context.VpePageContext;
+import org.jboss.tools.vpe.editor.util.VpeStyleUtil;
public class VpeFunctionHref extends VpeFunctionSrc {
@Override
@@ -64,7 +65,7 @@
imgPath = inputPath.append(tagValue);
} else {
IPath basePath = tagPath.isAbsolute()
- ? getRootPath(input)
+ ? VpeStyleUtil.getRootPath(input)
: inputPath;
if (basePath != null) {
imgPath = basePath.append(tagPath);
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionSrc.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionSrc.java 2008-11-05 12:01:10 UTC (rev 11521)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionSrc.java 2008-11-05 12:13:29 UTC (rev 11522)
@@ -15,7 +15,6 @@
import java.net.URLDecoder;
import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
import org.eclipse.jface.text.IDocument;
@@ -27,16 +26,13 @@
import org.jboss.tools.common.kb.KbException;
import org.jboss.tools.common.kb.ParamList;
import org.jboss.tools.common.kb.wtp.WtpKbConnector;
-import org.jboss.tools.common.model.XModel;
-import org.jboss.tools.common.model.project.IModelNature;
-import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.common.resref.core.ResourceReference;
-import org.jboss.tools.jst.web.project.WebProject;
import org.jboss.tools.jst.web.tld.IFilePathEncoder;
import org.jboss.tools.vpe.VpePlugin;
import org.jboss.tools.vpe.editor.context.VpePageContext;
import org.jboss.tools.vpe.editor.template.VpeCreatorUtil;
import org.jboss.tools.vpe.editor.util.ElService;
+import org.jboss.tools.vpe.editor.util.VpeStyleUtil;
import org.w3c.dom.Node;
public class VpeFunctionSrc extends VpeFunction {
@@ -90,7 +86,7 @@
if (input instanceof ILocationProvider) {
imgPath = inputPath.append(tagValue);
} else {
- IPath basePath = tagPath.isAbsolute() ? getRootPath(input)
+ IPath basePath = tagPath.isAbsolute() ? VpeStyleUtil.getRootPath(input)
: inputPath;
if (basePath != null) {
imgPath = basePath.append(tagPath);
@@ -153,31 +149,6 @@
return inputPath;
}
- protected IPath getRootPath(IEditorInput input) {
- IPath rootPath = null;
- if (input instanceof IFileEditorInput) {
- IProject project = ((IFileEditorInput) input).getFile()
- .getProject();
- if (project != null && project.isOpen()) {
- IModelNature modelNature = EclipseResourceUtil
- .getModelNature(project);
- if (modelNature != null) {
- XModel model = modelNature.getModel();
- String rootPathStr = WebProject.getInstance(model)
- .getWebRootLocation();
- if (rootPathStr != null) {
- rootPath = new Path(rootPathStr);
- } else {
- rootPath = project.getLocation();
- }
- } else {
- rootPath = project.getLocation();
- }
- }
- }
- return rootPath;
- }
-
protected String getUnresolved() {
return IMG_PREFIX + getAbsoluteResourcePath(IMG_UNRESOLVED).replace('\\', '/');
}
16 years, 2 months
JBoss Tools SVN: r11521 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla.
by jbosstools-commits＠lists.jboss.org
Author: sdzmitrovich
Date: 2008-11-05 07:01:10 -0500 (Wed, 05 Nov 2008)
New Revision: 11521
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java
Log:
was deleted deprecated code
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java 2008-11-05 11:51:11 UTC (rev 11520)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java 2008-11-05 12:01:10 UTC (rev 11521)
@@ -792,47 +792,4 @@
return editor;
}
- /**
- *
- * @param menu
- */
- private void addInvisibleTagsSupportToMenu(Menu menu) {
-
- // create menu item
- MenuItem menuItem = new MenuItem(menu, SWT.PUSH);
-
- // get default value of flag
- boolean showInvisibleTags = Constants.YES_STRING
- .equals(VpePreference.SHOW_INVISIBLE_TAGS.getValue());
-
- // set text
- menuItem.setText((showInvisibleTags ? VpeUIMessages.HIDE
- : VpeUIMessages.SHOW)
- + Constants.WHITE_SPACE + VpeUIMessages.NON_VISUAL_TAGS);
-
- // add listener
- menuItem.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- MenuItem selectedItem = (MenuItem) e.widget;
-
- // get current value of flag
- boolean showInvisibleTags = !controller.getVisualBuilder()
- .isShowInvisibleTags();
-
- // change text
- selectedItem
- .setText((showInvisibleTags ? VpeUIMessages.HIDE
- : VpeUIMessages.SHOW)
- + Constants.WHITE_SPACE
- + VpeUIMessages.NON_VISUAL_TAGS);
-
- // change flag
- controller.getVisualBuilder().setShowInvisibleTags(
- showInvisibleTags);
- // update vpe
- controller.visualRefresh();
- }
- });
- }
}
\ No newline at end of file
16 years, 2 months
JBoss Tools SVN: r11520 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2008-11-05 06:51:11 -0500 (Wed, 05 Nov 2008)
New Revision: 11520
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/KeyEventManager.java
Log:
JBIDE-3070, code adjustment
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/KeyEventManager.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/KeyEventManager.java 2008-11-05 09:59:10 UTC (rev 11519)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/KeyEventManager.java 2008-11-05 11:51:11 UTC (rev 11520)
@@ -24,10 +24,8 @@
import org.jboss.tools.vpe.editor.selection.VpeSelectionController;
import org.jboss.tools.vpe.editor.util.SelectionUtil;
import org.jboss.tools.vpe.editor.util.TextUtil;
-import org.jboss.tools.vpe.editor.util.VpeDebugUtil;
import org.mozilla.interfaces.nsIDOMKeyEvent;
import org.mozilla.interfaces.nsIDOMNode;
-import org.mozilla.interfaces.nsISelection;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -55,17 +53,11 @@
*/
private VpePageContext pageContext;
- /**
- * selection controller
- */
- private VpeSelectionController selectionController;
-
public KeyEventManager(StructuredTextEditor sourceEditor,
VpeDomMapping domMapping, VpePageContext pageContext, VpeSelectionController selectionController) {
this.sourceEditor = sourceEditor;
this.domMapping = domMapping;
this.pageContext = pageContext;
- setSelectionController(selectionController);
}
final public boolean handleKeyPress(nsIDOMKeyEvent keyEvent) {
@@ -101,11 +93,11 @@
} else if ((keyCode == nsIDOMKeyEvent.DOM_VK_BACK_SPACE)
&& (!keyEvent.getShiftKey())) {
- return handleLeftDelete(keyEvent);
+ return handleDelete(keyEvent,ST.DELETE_PREVIOUS);
} else if ((keyCode == nsIDOMKeyEvent.DOM_VK_DELETE)
&& (!keyEvent.getShiftKey())) {
- return handleRightDelete(keyEvent);
+ return handleDelete(keyEvent,ST.DELETE_NEXT);
} else if ((keyCode == nsIDOMKeyEvent.DOM_VK_PAGE_UP)
&& (!keyEvent.getShiftKey())) {
@@ -204,7 +196,6 @@
return true;
}
-
/**
* Default implementation of a handling of a pressing the "delete" event
*
@@ -212,9 +203,10 @@
*
* @param keyEvent
* - event
+ * @param deleteDirection - direction of deleted Text
* @return whether handled event
*/
- protected boolean handleRightDelete(nsIDOMKeyEvent keyEvent) {
+ private boolean handleDelete(nsIDOMKeyEvent keyEvent, int delete) {
VpeNodeMapping selectedNodeMapping = SelectionUtil
.getNodeMappingBySourceSelection(getSourceEditor(),
@@ -262,9 +254,7 @@
}
// if template can't give necessary information
else {
-
editable = false;
-
}
}
// if node is simple text
@@ -273,94 +263,14 @@
}
if (editable) {
-
- sourceEditor.getTextViewer().getTextWidget().invokeAction(
- ST.DELETE_NEXT);
-
+ sourceEditor.getTextViewer().getTextWidget().invokeAction(
+ delete);
}
return true;
-
}
/**
- * Default handling of a pressing the "backspace" event
- *
- * Override this method to handle the "backspace" event
- *
- * @param keyEvent
- * - event
- * @return whether handled event
- */
- protected boolean handleLeftDelete(nsIDOMKeyEvent keyEvent) {
- VpeNodeMapping selectedNodeMapping = SelectionUtil
- .getNodeMappingBySourceSelection(getSourceEditor(),
- getDomMapping());
-
- if (selectedNodeMapping == null)
- return false;
-
- boolean editable = false;
-
- // if selected node is element
- if (selectedNodeMapping instanceof VpeElementMapping) {
-
- VpeElementMapping elementMapping = (VpeElementMapping) selectedNodeMapping;
-
- VpeElementData elementData = elementMapping.getElementData();
-
- VpeTemplate template = elementMapping.getTemplate();
-
- nsIDOMNode visualNode = SelectionUtil
- .getLastSelectedNode(getPageContext());
-
- NodeData nodeData = template.getNodeData(visualNode, elementData,
- domMapping);
-
- if (nodeData != null) {
- editable = nodeData.isEditable();
-
- if (editable && nodeData.getType() == NodeData.ATTRIBUTE
- && nodeData.getSourceNode() == null) {
-
- Node newNode = createAttribute(
- (Element) selectedNodeMapping.getSourceNode(),
- ((AttributeData) nodeData).getAttributeName(),
- EMPTY_STRING);
-
- nodeData.setSourceNode(newNode);
-
- SelectionUtil.setSourceSelection(pageContext, newNode, 0);
-
- return true;
-
- }
-
- }
- // if template can't give necessary information
- else {
-
- editable = false;
-
- }
- }
- // if node is simple text
- else {
- editable = true;
- }
-
- if (editable) {
-
- sourceEditor.getTextViewer().getTextWidget().invokeAction(
- ST.DELETE_PREVIOUS);
-
- }
-
- return true;
-
- }
-
- /**
* Default handling of a pressing the "end" event - always return false.
*
* Override this method to handle of a pressing the "end" event
@@ -498,18 +408,4 @@
return null;
}
-
- /**
- * @return the selectionController
- */
- private VpeSelectionController getSelectionController() {
- return selectionController;
- }
-
- /**
- * @param selectionController the selectionController to set
- */
- private void setSelectionController(VpeSelectionController selectionController) {
- this.selectionController = selectionController;
- }
}
16 years, 2 months
JBoss Tools SVN: r11518 - in trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf: src/org/jboss/tools/jsf/vpe/ajax4jsf/template and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2008-11-05 04:59:06 -0500 (Wed, 05 Nov 2008)
New Revision: 11518
Added:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/src/org/jboss/tools/jsf/vpe/ajax4jsf/template/Ajax4JSFPageTemplate.java
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/META-INF/MANIFEST.MF
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/templates/vpe-templates-ajax4jsf.xml
Log:
https://jira.jboss.org/jira/browse/JBIDE-3020, https://jira.jboss.org/jira/browse/JBIDE-3039, https://jira.jboss.org/jira/browse/JBIDE-3036, templates were added.
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/META-INF/MANIFEST.MF 2008-11-05 09:58:32 UTC (rev 11517)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/META-INF/MANIFEST.MF 2008-11-05 09:59:06 UTC (rev 11518)
@@ -6,9 +6,10 @@
Bundle-Version: 2.1.0
Bundle-Localization: plugin
Require-Bundle: org.jboss.tools.vpe,
- org.eclipse.ui,
+ org.eclipse.ui,
org.eclipse.core.runtime,
org.jboss.tools.jst.jsp,
- org.mozilla.xpcom
+ org.mozilla.xpcom,
+ org.jboss.tools.jsf.vpe.richfaces;bundle-version="2.1.0"
Eclipse-LazyStart: true
Bundle-Vendor: Red Hat, Inc.
Added: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/src/org/jboss/tools/jsf/vpe/ajax4jsf/template/Ajax4JSFPageTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/src/org/jboss/tools/jsf/vpe/ajax4jsf/template/Ajax4JSFPageTemplate.java (rev 0)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/src/org/jboss/tools/jsf/vpe/ajax4jsf/template/Ajax4JSFPageTemplate.java 2008-11-05 09:59:06 UTC (rev 11518)
@@ -0,0 +1,64 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2008 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.jsf.vpe.ajax4jsf.template;
+
+import org.jboss.tools.jsf.vpe.richfaces.ComponentUtil;
+import org.jboss.tools.vpe.editor.context.VpePageContext;
+import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate;
+import org.jboss.tools.vpe.editor.template.VpeChildrenInfo;
+import org.jboss.tools.vpe.editor.template.VpeCreationData;
+import org.jboss.tools.vpe.editor.util.HTML;
+import org.mozilla.interfaces.nsIDOMDocument;
+import org.mozilla.interfaces.nsIDOMElement;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+
+public class Ajax4JSFPageTemplate extends VpeAbstractTemplate {
+
+ private static final String HEAD_FACET_NAME = "head"; //$NON-NLS-1$
+
+ public VpeCreationData create(VpePageContext pageContext, Node sourceNode,
+ nsIDOMDocument visualDocument) {
+ Element sourceElement = (Element) sourceNode;
+ nsIDOMElement divHtml = visualDocument.createElement(HTML.TAG_DIV);
+ nsIDOMElement divHead = visualDocument.createElement(HTML.TAG_DIV);
+ nsIDOMElement divBody = visualDocument.createElement(HTML.TAG_DIV);
+ VpeCreationData creationData = new VpeCreationData(divHtml);
+
+ /*
+ * Encoding label value
+ */
+ Element headFacet = ComponentUtil.getFacet(sourceElement,
+ HEAD_FACET_NAME);
+ if (null != headFacet) {
+ VpeChildrenInfo childrenInfo = new VpeChildrenInfo(divHead);
+ childrenInfo.addSourceChild(headFacet);
+ divHtml.appendChild(divHead);
+ creationData.addChildrenInfo(childrenInfo);
+ }
+
+ VpeChildrenInfo divBodyInfo = new VpeChildrenInfo(divBody);
+ creationData.addChildrenInfo(divBodyInfo);
+ divHtml.appendChild(divBody);
+ for (Node child : ComponentUtil.getChildren(sourceElement, true)) {
+ divBodyInfo.addSourceChild(child);
+ }
+
+ return creationData;
+ }
+
+ public boolean isRecreateAtAttrChange(VpePageContext pageContext,
+ Element sourceElement, nsIDOMDocument visualDocument,
+ nsIDOMElement visualNode, Object data, String name, String value) {
+ return true;
+ }
+
+}
Property changes on: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/src/org/jboss/tools/jsf/vpe/ajax4jsf/template/Ajax4JSFPageTemplate.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Id Revision Date
Name: svn:eol-style
+ native
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/templates/vpe-templates-ajax4jsf.xml
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/templates/vpe-templates-ajax4jsf.xml 2008-11-05 09:58:32 UTC (rev 11517)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/templates/vpe-templates-ajax4jsf.xml 2008-11-05 09:59:06 UTC (rev 11518)
@@ -5,8 +5,8 @@
<vpe:template-taglib uri="http://richfaces.org/a4j" prefix="a4j" />
<vpe:tag name="a4j:page" case-sensitive="yes">
- <vpe:template children="yes" modify="yes">
- <vpe:copy attrs="id,style,dir"/>
+ <vpe:template children="yes" modify="yes" hasImaginaryBorder="yes"
+ class="org.jboss.tools.jsf.vpe.ajax4jsf.template.Ajax4JSFPageTemplate">
<vpe:resize>
<vpe:width width-attr="style.width" />
<vpe:height height-attr="style.height" />
@@ -20,7 +20,8 @@
<vpe:tag name="a4j:region" case-sensitive="yes">
<vpe:template children="yes" modify="yes">
- <vpe:copy attrs="id"/>
+ <div id="{@id}" class="{@styleClass}" style="{@style}" title="{tagstring()}">
+ </div>
<vpe:resize>
<vpe:width width-attr="style.width" />
<vpe:height height-attr="style.height" />
@@ -182,7 +183,8 @@
<vpe:tag name="a4j:form" case-sensitive="yes">
<vpe:template children="yes" modify="yes">
- <vpe:copy attrs="id"/>
+ <div id="{@id}" class="{@styleClass}" style="{@style}" title="{tagstring()}">
+ </div>
<vpe:dnd>
<vpe:drag start-enable="yes" />
<vpe:drop container="yes" />
16 years, 2 months
JBoss Tools SVN: r11517 - in trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks: utils and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2008-11-05 04:58:32 -0500 (Wed, 05 Nov 2008)
New Revision: 11517
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/UIUtils.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/XMLSourceModelAnalyzer.java
Log:
JBIDE-2988
Extract the check method and put it in the UiUtil class.
Add the selector check in java bean analyzer.
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java 2008-11-05 09:49:54 UTC (rev 11516)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java 2008-11-05 09:58:32 UTC (rev 11517)
@@ -690,6 +690,7 @@
public Object buildSourceInputObjects(GraphInformations graphInfo,
SmooksResourceListType listType, IFile sourceFile)
throws InvocationTargetException {
+ UIUtils.checkSelector(listType);
return this.buildSourceInputObjects(graphInfo, listType, sourceFile,
null);
}
@@ -697,6 +698,7 @@
public Object buildTargetInputObjects(GraphInformations graphInfo,
SmooksResourceListType listType, IFile sourceFile)
throws InvocationTargetException {
+ UIUtils.checkSelector(listType);
return this.buildTargetInputObjects(graphInfo, listType, sourceFile,
null);
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/UIUtils.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/UIUtils.java 2008-11-05 09:49:54 UTC (rev 11516)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/UIUtils.java 2008-11-05 09:58:32 UTC (rev 11517)
@@ -32,6 +32,9 @@
import org.jboss.tools.smooks.javabean.analyzer.JavaModelConnectionResolveCommand;
import org.jboss.tools.smooks.javabean.analyzer.JavaModelResolveCommand;
import org.jboss.tools.smooks.javabean.model.JavaBeanModel;
+import org.jboss.tools.smooks.model.AbstractResourceConfig;
+import org.jboss.tools.smooks.model.ResourceConfigType;
+import org.jboss.tools.smooks.model.SmooksResourceListType;
import org.jboss.tools.smooks.model.util.SmooksModelUtils;
import org.jboss.tools.smooks.ui.SmooksUIActivator;
import org.jboss.tools.smooks.ui.ViewerInitorStore;
@@ -51,6 +54,9 @@
*/
public class UIUtils {
+ public static final String[] SELECTORE_SPLITER = new String[] { ":", "\\",
+ "/" };
+
public static FillLayout createFillLayout(int marginW, int marginH) {
FillLayout fill = new FillLayout();
fill.marginHeight = marginH;
@@ -58,7 +64,46 @@
return fill;
}
- public static void assignConnectionPropertyToBinding(
+ public static void checkSelector(String selector)
+ throws InvocationTargetException {
+ if (selector == null)
+ return;
+ for (int i = 0; i < SELECTORE_SPLITER.length; i++) {
+ String splitString = SELECTORE_SPLITER[i];
+ if (selector.indexOf(splitString) != -1) {
+ throw new InvocationTargetException(new Exception(
+ "The Selector string dosen't support \"" + splitString
+ + "\" character"));
+ }
+ }
+ }
+
+ public static void checkSelector(SmooksResourceListType listType)
+ throws InvocationTargetException {
+ List<AbstractResourceConfig> lists = listType
+ .getAbstractResourceConfig();
+ for (Iterator<AbstractResourceConfig> iterator = lists.iterator(); iterator
+ .hasNext();) {
+ ResourceConfigType resourceConfig = (ResourceConfigType) iterator
+ .next();
+ String selector = resourceConfig.getSelector();
+ UIUtils.checkSelector(selector);
+ List<Object> list = SmooksModelUtils
+ .getBindingListFromResourceConfigType(resourceConfig);
+ if (list == null)
+ continue;
+ for (Iterator<Object> iterator2 = list.iterator(); iterator2
+ .hasNext();) {
+ AnyType binding = (AnyType) iterator2.next();
+ String bindingMessage = SmooksModelUtils
+ .getAttributeValueFromAnyType(binding,
+ SmooksModelUtils.ATTRIBUTE_SELECTOR);
+ UIUtils.checkSelector(bindingMessage);
+ }
+ }
+ }
+
+ public static void assignConnectionPropertyToBinding(
LineConnectionModel connection, AnyType binding,
String[] ignorePropertiesName) {
Object[] bindingPros = connection.getPropertyArray();
@@ -68,12 +113,13 @@
String pname = property.getName();
for (int j = 0; j < ignorePropertiesName.length; j++) {
String ignoreName = ignorePropertiesName[j];
- if(pname.equals(ignoreName)){
+ if (pname.equals(ignoreName)) {
ignore = true;
break;
}
}
- if(ignore) continue;
+ if (ignore)
+ continue;
String pvalue = property.getValue();
binding.getAnyAttribute()
.add(
@@ -82,8 +128,8 @@
}
}
- public static void assignBindingPropertyToMappingModel(AnyType binding, MappingModel model,
- Object[] ignoreProperties) {
+ public static void assignBindingPropertyToMappingModel(AnyType binding,
+ MappingModel model, Object[] ignoreProperties) {
FeatureMap it = binding.getAnyAttribute();
for (int i = 0; i < it.size(); i++) {
EStructuralFeature feature = it.getEStructuralFeature(i);
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/XMLSourceModelAnalyzer.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/XMLSourceModelAnalyzer.java 2008-11-05 09:49:54 UTC (rev 11516)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/XMLSourceModelAnalyzer.java 2008-11-05 09:58:32 UTC (rev 11517)
@@ -11,16 +11,11 @@
package org.jboss.tools.smooks.xml2java.analyzer;
import java.lang.reflect.InvocationTargetException;
-import java.util.Iterator;
-import java.util.List;
import org.eclipse.core.resources.IFile;
-import org.eclipse.emf.ecore.xml.type.AnyType;
import org.jboss.tools.smooks.graphical.GraphInformations;
-import org.jboss.tools.smooks.model.AbstractResourceConfig;
-import org.jboss.tools.smooks.model.ResourceConfigType;
import org.jboss.tools.smooks.model.SmooksResourceListType;
-import org.jboss.tools.smooks.model.util.SmooksModelUtils;
+import org.jboss.tools.smooks.utils.UIUtils;
/**
* @author Dart Peng<br>
@@ -28,8 +23,6 @@
*/
public class XMLSourceModelAnalyzer extends AbstractXMLModelAnalyzer {
- public static final String[] SELECTORE_SPLITER = new String[] { ":", "\\", "/" };
-
public XMLSourceModelAnalyzer() {
super("sourceDataPath");
}
@@ -38,40 +31,7 @@
public Object buildSourceInputObjects(GraphInformations graphInfo,
SmooksResourceListType listType, IFile sourceFile)
throws InvocationTargetException {
- List<AbstractResourceConfig> lists = listType
- .getAbstractResourceConfig();
- for (Iterator<AbstractResourceConfig> iterator = lists.iterator(); iterator
- .hasNext();) {
- ResourceConfigType resourceConfig = (ResourceConfigType) iterator
- .next();
- String selector = resourceConfig.getSelector();
- checkBindingSelector(selector);
- List<Object> list = SmooksModelUtils
- .getBindingListFromResourceConfigType(resourceConfig);
- if(list == null) continue;
- for (Iterator<Object> iterator2 = list.iterator(); iterator2
- .hasNext();) {
- AnyType binding = (AnyType) iterator2.next();
- String bindingMessage = SmooksModelUtils
- .getAttributeValueFromAnyType(binding,
- SmooksModelUtils.ATTRIBUTE_SELECTOR);
- checkBindingSelector(bindingMessage);
- }
- }
+ UIUtils.checkSelector(listType);
return super.buildSourceInputObjects(graphInfo, listType, sourceFile);
}
-
- protected void checkBindingSelector(String message)
- throws InvocationTargetException {
- if(message == null) return;
- for (int i = 0; i < SELECTORE_SPLITER.length; i++) {
- String splitString = SELECTORE_SPLITER[i];
- if (message.indexOf(splitString) != -1) {
- throw new InvocationTargetException(new Exception(
- "[XML] The Selector string dosen't support \""
- + splitString + "\" character"));
- }
- }
- }
-
}
16 years, 2 months