JBoss Tools SVN: r10863 - trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2008-10-15 15:42:20 -0400 (Wed, 15 Oct 2008)
New Revision: 10863
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java
Log:
JBIDE-2907 The org.jboss.tools.jsf.vpe.jsf.test tests aren't being run
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2008-10-15 17:43:41 UTC (rev 10862)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2008-10-15 19:42:20 UTC (rev 10863)
@@ -61,7 +61,7 @@
public class JsfAllTests {
public static final String IMPORT_PROJECT_NAME = "jsfTest"; //$NON-NLS-1$
- public static final String IMPORT_JSF_20_PROJECT_NAME = "jsf2Test"; //$NON-NLS-1$
+ public static final String IMPORT_JSF_20_PROJECT_NAME = "jsf2test"; //$NON-NLS-1$
public static Test suite() {
16 years, 3 months
JBoss Tools SVN: r10862 - in trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4: model and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2008-10-15 13:43:41 -0400 (Wed, 15 Oct 2008)
New Revision: 10862
Added:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlSerializer.java
Modified:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlEditor.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/Process.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/Transition.java
Log:
basic serialization
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlEditor.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlEditor.java 2008-10-15 16:23:38 UTC (rev 10861)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlEditor.java 2008-10-15 17:43:41 UTC (rev 10862)
@@ -3,17 +3,12 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import java.util.List;
import org.eclipse.gef.EditPartFactory;
import org.eclipse.gef.palette.PaletteRoot;
import org.jboss.tools.flow.common.editor.GenericModelEditor;
import org.jboss.tools.flow.common.editpart.DefaultEditPartFactory;
-import org.jboss.tools.flow.common.model.Element;
import org.jboss.tools.flow.common.registry.ElementRegistry;
-import org.jboss.tools.flow.common.wrapper.ConnectionWrapper;
-import org.jboss.tools.flow.common.wrapper.ContainerWrapper;
-import org.jboss.tools.flow.common.wrapper.NodeWrapper;
import org.jboss.tools.flow.common.wrapper.Wrapper;
public class JpdlEditor extends GenericModelEditor {
@@ -30,33 +25,10 @@
return ElementRegistry.createWrapper("org.jboss.tools.flow.jpdl4.process");
}
- private void write(Wrapper wrapper, OutputStream os) {
- Object object = wrapper.getElement();
- if (object instanceof Element) {
- Element element = (Element)object;
- String xml = (String)element.getMetaData("xml");
- System.out.println(xml);
- }
- if (wrapper instanceof ContainerWrapper) {
- ContainerWrapper containerWrapper = (ContainerWrapper)wrapper;
- List<NodeWrapper> children = containerWrapper.getElements();
- for (NodeWrapper nodeWrapper : children) {
- write(nodeWrapper, os);
- }
- }
- if (wrapper instanceof NodeWrapper) {
- NodeWrapper nodeWrapper = (NodeWrapper)wrapper;
- List<ConnectionWrapper> children = nodeWrapper.getOutgoingConnections();
- for (ConnectionWrapper connectionWrapper : children) {
- write(connectionWrapper, os);
- }
- }
- }
-
protected void writeModel(OutputStream os) throws IOException {
Object object = getModel();
if (object instanceof Wrapper) {
- write((Wrapper)object, os);
+ JpdlSerializer.serialize((Wrapper)object, os);
}
}
Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlSerializer.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlSerializer.java (rev 0)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlSerializer.java 2008-10-15 17:43:41 UTC (rev 10862)
@@ -0,0 +1,149 @@
+package org.jboss.tools.flow.jpdl4.editor;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.util.List;
+
+import org.jboss.tools.flow.common.model.Element;
+import org.jboss.tools.flow.common.wrapper.ConnectionWrapper;
+import org.jboss.tools.flow.common.wrapper.ContainerWrapper;
+import org.jboss.tools.flow.common.wrapper.NodeWrapper;
+import org.jboss.tools.flow.common.wrapper.Wrapper;
+import org.jboss.tools.flow.jpdl4.model.EndState;
+import org.jboss.tools.flow.jpdl4.model.Process;
+import org.jboss.tools.flow.jpdl4.model.StartState;
+import org.jboss.tools.flow.jpdl4.model.State;
+import org.jboss.tools.flow.jpdl4.model.SuperState;
+import org.jboss.tools.flow.jpdl4.model.Transition;
+
+public class JpdlSerializer {
+
+ public static void serialize(Wrapper wrapper, OutputStream os) throws IOException {
+ StringBuffer buffer = new StringBuffer();
+ appendToBuffer(buffer, wrapper, 0);
+ Writer writer = new OutputStreamWriter(os);
+ writer.write(buffer.toString());
+ System.out.println(buffer.toString());
+ }
+
+ private static void appendToBuffer(StringBuffer buffer, Wrapper wrapper, int level) {
+ Object object = wrapper.getElement();
+ if (!(object instanceof Element)) return;
+ appendOpening(buffer, wrapper, level);
+ appendBody(buffer, wrapper, level);
+ appendClosing(buffer, wrapper, level);
+ }
+
+ private static void appendOpening(StringBuffer buffer, Wrapper wrapper, int level) {
+ Element element = (Element)wrapper.getElement();
+ buffer.append("\n");
+ appendPadding(buffer, level);
+ if (element instanceof Transition) {
+ buffer.append("<transition");
+ Transition transition = (Transition)element;
+ if (transition.getTo() != null) {
+ String value = transition.getTo().getName();
+ value = value == null ? "" : value;
+ buffer.append("to=\"" + value + "\"");
+ }
+ buffer.append(">");
+ } else if (element instanceof EndState) {
+ buffer.append("<end-state");
+ EndState endState = (EndState)element;
+ if (endState.getName() != null) {
+ buffer.append(" ");
+ String value = endState.getName();
+ buffer.append("name=\"" + value + "\"");
+ }
+ buffer.append(">");
+ } else if (element instanceof StartState) {
+ buffer.append("<start-state");
+ StartState startState = (StartState)element;
+ if (startState.getName() != null) {
+ buffer.append(" ");
+ String value = startState.getName();
+ buffer.append("name=\"" + value + "\"");
+ }
+ buffer.append(">");
+ } else if (element instanceof SuperState) {
+ buffer.append("<super-state");
+ SuperState superState = (SuperState)element;
+ if (superState.getName() != null) {
+ buffer.append(" ");
+ String value = superState.getName();
+ buffer.append("name=\"" + value + "\"");
+ }
+ buffer.append(">");
+ } else if (element instanceof State) {
+ buffer.append("<state");
+ State state = (State)element;
+ if (state.getName() != null) {
+ buffer.append(" ");
+ String value = state.getName();
+ buffer.append("name=\"" + value + "\"");
+ }
+ buffer.append(">");
+ } else if (element instanceof Process) {
+ buffer.append("<process");
+ Process process = (Process)element;
+ if (process.getInitial() != null) {
+ buffer.append(" ");
+ String value = process.getInitial().getName();
+ value = value == null ? "" : value;
+ buffer.append("initial=\"" + value + "\"");
+ }
+ if (process.getName() != null) {
+ buffer.append(" ");
+ String value = process.getName();
+ buffer.append("name=\"" + value + "\"");
+ }
+ buffer.append(">");
+ }
+
+ }
+
+ private static void appendPadding(StringBuffer buffer, int level) {
+ for (int i = 0; i < level; i++) {
+ buffer.append(" ");
+ }
+ }
+
+ private static void appendClosing(StringBuffer buffer, Wrapper wrapper, int level) {
+ Element element = (Element)wrapper.getElement();
+ buffer.append("\n");
+ appendPadding(buffer, level);
+ if (element instanceof Transition) {
+ buffer.append("</transition>");
+ } else if (element instanceof EndState) {
+ buffer.append("</end-state>");
+ } else if (element instanceof StartState) {
+ buffer.append("</start-state>");
+ } else if (element instanceof SuperState) {
+ buffer.append("</super-state>");
+ } else if (element instanceof State) {
+ buffer.append("</state>");
+ } else if (element instanceof Process) {
+ buffer.append("</process>");
+ }
+ }
+
+ private static void appendBody(StringBuffer buffer, Wrapper wrapper, int level) {
+ if (wrapper instanceof ContainerWrapper) {
+ ContainerWrapper containerWrapper = (ContainerWrapper)wrapper;
+ List<NodeWrapper> children = containerWrapper.getElements();
+ for (NodeWrapper nodeWrapper : children) {
+ appendToBuffer(buffer, nodeWrapper, ++level);
+ }
+ }
+ if (wrapper instanceof NodeWrapper) {
+ NodeWrapper nodeWrapper = (NodeWrapper)wrapper;
+ List<ConnectionWrapper> children = nodeWrapper.getOutgoingConnections();
+ for (ConnectionWrapper connectionWrapper : children) {
+ appendToBuffer(buffer, connectionWrapper, ++level);
+ }
+ }
+ }
+
+}
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/Process.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/Process.java 2008-10-15 16:23:38 UTC (rev 10861)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/Process.java 2008-10-15 17:43:41 UTC (rev 10862)
@@ -7,6 +7,8 @@
public class Process extends DefaultFlow {
+ private Node initial = null;
+
public Process() {
super();
setMetaData("xml", "process-definition");
@@ -21,5 +23,13 @@
}
return null;
}
+
+ public Node getInitial() {
+ return initial;
+ }
+
+ public void setInitial(Node node) {
+ initial = node;
+ }
}
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/Transition.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/Transition.java 2008-10-15 16:23:38 UTC (rev 10861)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/Transition.java 2008-10-15 17:43:41 UTC (rev 10862)
@@ -5,13 +5,28 @@
public class Transition extends DefaultConnection {
+ private static final String SCHEMA =
+ "<element name='transition'>" +
+ " <complexType>" +
+ " <attribute name='to' type='string'/>" +
+ " </complexType>" +
+ "</element>";
+
public Transition() {
this(null, null);
}
public Transition(Node from, Node to) {
super(from, to);
- setMetaData("xml", "transition");
+ setMetaData("schema", SCHEMA);
}
+ String getToAsString() {
+ if (getTo() == null) {
+ return null;
+ } else {
+ return getTo().getName();
+ }
+ }
+
}
16 years, 3 months
JBoss Tools SVN: r10861 - in trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces: resources/menuGroup and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2008-10-15 12:23:38 -0400 (Wed, 15 Oct 2008)
New Revision: 10861
Added:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/dropDownMenu/list-bg.png
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/menuGroup/arrow.gif
Removed:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/menuGroup/list-bg.png
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/dropDownMenu/dropDownMenu.css
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/menuGroup/menuGroup.css
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/menuItem/menuItem.css
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDropDownMenuTemplate.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesMenuGroupTemplate.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesMenuItemTemplate.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/templates/vpe-templates-richfaces.xml
Log:
JBIDE-2497, items value creation was updated, folder icon was added to menuGroup, css styles were updated.
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/dropDownMenu/dropDownMenu.css
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/dropDownMenu/dropDownMenu.css 2008-10-15 16:23:34 UTC (rev 10860)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/dropDownMenu/dropDownMenu.css 2008-10-15 16:23:38 UTC (rev 10861)
@@ -20,40 +20,56 @@
font-weight:bold;
}
.rich-menu-list-border {
-
+ font-family:Arial,Verdana,sans-serif;
+ background-color:#F1EEE9;
+ border-color:#C4C0B9;
+ border:1px solid;
}
.rich-menu-list-bg {
-
+ background:transparent none repeat-y scroll left center;
+ background-image:url(list-bg.png);
+ background-color:#F1EEE9;
}
-[vpe-ddm-menu-ul] {
+[vpe-ddm-menu-ul],
+[vpe-ddm-menu-title-ul],
+[vpe-ddm-menu-children-ul] {
margin: 0;
padding: 0;
list-style: none;
width: 150px;
display: block;
+ cursor: pointer;
}
-[vpe-ddm-menu-li] {
+[vpe-ddm-menu-li],
+[vpe-ddm-menu-title-li] {
position: relative;
- height: 30px;
+ height: 20px;
}
-[vpe-ddm-menu-li] ul {
+[vpe-ddm-menu-li] ul,
+[vpe-ddm-menu-title-li] ul {
position: absolute;
left: 149px; /* Set 1px less than menu width */
top: 0;
display: none;
}
-[vpe-ddm-menu-li] div { /* ddm item/group div */
-
+/*
+* Droping-down for top menu elements
+*/
+[vpe-ddm-menu-title-ul]:hover > li,
+[vpe-ddm-menu-title-ul]:hover > li > ul,
+[vpe-ddm-menu-title-ul]:hover > li > ul > li {
+ display: block;
}
-[vpe-ddm-menu-li] div:hover {
-
-}
-[vpe-ddm-menu-ul]:hover {
-
-}
-/*drop-down mechanism*/
+/*
+* Droping-down for nested items
+*/
[vpe-ddm-menu-li]:hover > ul,
[vpe-ddm-menu-li]:hover > li {
display: block;
}
+.dr-menu-top-div {
+ width: 100%;
+ height: 100%;
+ overflow: hidden;
+}
\ No newline at end of file
Copied: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/dropDownMenu/list-bg.png (from rev 10844, trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/menuGroup/list-bg.png)
===================================================================
(Binary files differ)
Added: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/menuGroup/arrow.gif
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/menuGroup/arrow.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/menuGroup/list-bg.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/menuGroup/menuGroup.css
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/menuGroup/menuGroup.css 2008-10-15 16:23:34 UTC (rev 10860)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/menuGroup/menuGroup.css 2008-10-15 16:23:38 UTC (rev 10861)
@@ -7,7 +7,8 @@
padding-left: 10px; /*padding for group icon*/
}
.rich-menu-group-folder {
-
+ padding-left: 10px; /*padding for group folder icon*/
+ padding-right: 10px; /*padding for group folder icon*/
}
.rich-menu-group-over {
@@ -32,28 +33,18 @@
}
.rich-menu-item-icon-enabled {
border:0pt solid transparent;
- /*padding:2px 10px 2px 2px;*/
}
.rich-menu-item-icon-selected {
}
.rich-menu-list-border {
- font-family:Arial,Verdana,sans-serif;
- background-color:#F1EEE9;
- border-color:#C4C0B9;
- border:1px solid;
+
}
.rich-menu-list-bg {
- background:transparent none repeat-y scroll left center;
- background-image:url(list-bg.png);
- background-color:#F1EEE9;
- border-left-color:#C4C0B9;
- border-right-color:#C4C0B9;
- border-top-color:#C4C0B9;
- border-left-style:solid;
- border-left-width:1px;
- border-right-style:solid;
- border-right-width:1px;
- border-top-style:solid;
- border-top-width:1px;
+
+}
+.dr-menu-group-top-div {
+ width: 100%;
+ height: 100%;
+ overflow: hidden;
}
\ No newline at end of file
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/menuItem/menuItem.css
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/menuItem/menuItem.css 2008-10-15 16:23:34 UTC (rev 10860)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/menuItem/menuItem.css 2008-10-15 16:23:38 UTC (rev 10861)
@@ -1,7 +1,5 @@
.rich-menu-item {
font-family:Arial,Verdana,sans-serif;
- border-color:#C4C0B9;
- border:1px solid;
}
.rich-menu-item-label {
/*padding-left: 10px;*/ /*padding for item icon*/
@@ -37,3 +35,8 @@
.rich-menu-item-icon-selected {
}
+.dr-menu-item-top-div {
+ width: 100%;
+ height: 100%;
+ overflow: hidden;
+}
\ No newline at end of file
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDropDownMenuTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDropDownMenuTemplate.java 2008-10-15 16:23:34 UTC (rev 10860)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDropDownMenuTemplate.java 2008-10-15 16:23:38 UTC (rev 10861)
@@ -29,24 +29,25 @@
public class RichFacesDropDownMenuTemplate extends VpeAbstractTemplate {
/*
- * Public constants for drop down mechanism.
- */
- public final static String MENU_PARENT_ID = "vpe-ddm-menu-ul"; //$NON-NLS-1$
- public final static String MENU_CHILD_ID = "vpe-ddm-menu-li"; //$NON-NLS-1$
-
- /*
* rich:dropDownMenu constants
*/
- private final static String COMPONENT_NAME = "dropDownMenu"; //$NON-NLS-1$
- private final static String STYLE_PATH = "dropDownMenu/dropDownMenu.css"; //$NON-NLS-1$
- private final static String CHILD_GROUP_NAME = ":menuGroup"; //$NON-NLS-1$
- private final static String CHILD_ITEM_NAME = ":menuItem"; //$NON-NLS-1$
+ private static final String COMPONENT_NAME = "dropDownMenu"; //$NON-NLS-1$
+ private static final String STYLE_PATH = "dropDownMenu/dropDownMenu.css"; //$NON-NLS-1$
+ private static final String CHILD_GROUP_NAME = ":menuGroup"; //$NON-NLS-1$
+ private static final String CHILD_ITEM_NAME = ":menuItem"; //$NON-NLS-1$
private static final String LABEL_FACET_NAME = "label"; //$NON-NLS-1$
private static final String DEFAULT_DDM_TITLE = "ddm"; //$NON-NLS-1$
private static final String EMPTY = ""; //$NON-NLS-1$
private static final String SPACE = " "; //$NON-NLS-1$
/*
+ * Constants for drop down mechanism.
+ */
+ private static final String MENU_TOP_ID = "vpe-ddm-menu-title-ul"; //$NON-NLS-1$
+ private static final String MENU_TOP_ITEM_ID = "vpe-ddm-menu-title-li"; //$NON-NLS-1$
+ private static final String MENU_CHILDREN_LIST_ID = "vpe-ddm-menu-children-ul"; //$NON-NLS-1$
+
+ /*
* rich:dropDownMenu css styles names
*/
private static final String CSS_RICH_DDMENU_LABEL = "rich-ddmenu-label"; //$NON-NLS-1$
@@ -58,6 +59,7 @@
private static final String CSS_RICH_MENU_LIST_BG = "rich-menu-list-bg"; //$NON-NLS-1$
private static final String CSS_RICH_DDEMENU_LIST_DIV_STYLE = ""; //$NON-NLS-1$
private static final String CSS_RICH_DDEMENU_BORDER_DIV_STYLE = ""; //$NON-NLS-1$
+ private static final String CSS_MENU_TOP_DIV = "dr-menu-top-div"; //$NON-NLS-1$
/*
* rich:dropDownMenu attributes names
@@ -116,7 +118,6 @@
nsIDOMElement ddmMainUL;
nsIDOMElement ddmMainLI;
nsIDOMElement ddmChildrenUL;
-
nsIDOMElement ddmLabelDiv;
nsIDOMElement ddmTextSpan;
nsIDOMText ddmLabelText;
@@ -127,7 +128,6 @@
/*
* Creating visual elements
*/
-
ddmMainUL = visualDocument.createElement(HTML.TAG_UL);
ddmMainLI = visualDocument.createElement(HTML.TAG_LI);
ddmChildrenUL = visualDocument.createElement(HTML.TAG_UL);
@@ -147,21 +147,15 @@
// ddmLabelDiv.appendChild(ddmListDiv);
ddmListDiv.appendChild(ddmListBorderDiv);
ddmListBorderDiv.appendChild(ddmListBgDiv);
-
ddmMainUL.appendChild(ddmMainLI);
ddmMainLI.appendChild(ddmLabelDiv);
/*
- * Children <ul> will be added only if there are some of them.
- */
-// ddmMainLI.appendChild(ddmChildrenUL);
-
- /*
* Setting attributes for the drop-down mechanism
*/
- ddmMainUL.setAttribute(MENU_PARENT_ID, EMPTY);
- ddmMainLI.setAttribute(MENU_CHILD_ID, EMPTY);
- ddmChildrenUL.setAttribute(MENU_PARENT_ID, EMPTY);
+ ddmMainUL.setAttribute(MENU_TOP_ID, EMPTY);
+ ddmMainLI.setAttribute(MENU_TOP_ITEM_ID, EMPTY);
+ ddmChildrenUL.setAttribute(MENU_CHILDREN_LIST_ID, EMPTY);
/*
* Setting css classes
@@ -169,7 +163,8 @@
String labelDivClass = EMPTY;
String listBorderDivClass = EMPTY;
- labelDivClass += SPACE + CSS_RICH_DDMENU_LABEL + SPACE + CSS_RICH_DDMENU_LABEL_UNSELECT;
+ labelDivClass += SPACE + CSS_RICH_DDMENU_LABEL + SPACE
+ + CSS_RICH_DDMENU_LABEL_UNSELECT;
listBorderDivClass += SPACE + CSS_RICH_MENU_LIST_BORDER;
if (attrPresents(ddm_styleClass)) {
@@ -177,12 +172,14 @@
listBorderDivClass += SPACE + ddm_styleClass;
}
-// ddmLabelDiv.setAttribute(HTML.CLASS_ATTR, labelDivClass);
+// ddmLabelDiv.setAttribute(HTML.ATTR_CLASS, labelDivClass);
+ ddmLabelDiv.setAttribute(HTML.ATTR_CLASS, CSS_MENU_TOP_DIV);
ddmMainLI.setAttribute(HTML.ATTR_CLASS, labelDivClass);
ddmTextSpan.setAttribute(HTML.ATTR_CLASS, CSS_RICH_LABEL_TEXT_DECOR);
// ddmListBorderDiv.setAttribute(HTML.ATTR_CLASS, listBorderDivClass);
// ddmListBgDiv.setAttribute(HTML.ATTR_CLASS, CSS_RICH_MENU_LIST_BG);
- ddmChildrenUL.setAttribute(HTML.ATTR_CLASS, listBorderDivClass + SPACE + CSS_RICH_MENU_LIST_BG);
+ ddmChildrenUL.setAttribute(HTML.ATTR_CLASS, listBorderDivClass + SPACE
+ + CSS_RICH_MENU_LIST_BG);
/*
* Setting css styles
*/
@@ -197,11 +194,13 @@
cssLabelDivStyle += SPACE + ddm_style;
}
-// ddmListDiv.setAttribute(HTML.STYLE_ATTR, cssListDivStyle);
-// ddmListBorderDiv.setAttribute(HTML.STYLE_ATTR, cssListBorderDivStyle);
-// ddmLabelDiv.setAttribute(HTML.STYLE_ATTR, cssLabelDivStyle);
- ddmMainLI.setAttribute(HTML.ATTR_STYLE, cssListDivStyle + SPACE + cssListBorderDivStyle + SPACE + cssLabelDivStyle);
- ddmChildrenUL.setAttribute(HTML.ATTR_STYLE, cssListDivStyle + SPACE + cssListBorderDivStyle + SPACE + cssLabelDivStyle);
+// ddmListDiv.setAttribute(HTML.ATTR_STYLE, cssListDivStyle);
+// ddmListBorderDiv.setAttribute(HTML.ATTR_STYLE, cssListBorderDivStyle);
+// ddmLabelDiv.setAttribute(HTML.ATTR_STYLE, cssLabelDivStyle);
+ ddmMainLI.setAttribute(HTML.ATTR_STYLE, cssListDivStyle + SPACE
+ + cssListBorderDivStyle + SPACE + cssLabelDivStyle);
+ ddmChildrenUL.setAttribute(HTML.ATTR_STYLE, cssListDivStyle + SPACE
+ + cssListBorderDivStyle + SPACE + cssLabelDivStyle);
/*
* Encoding label value
*/
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesMenuGroupTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesMenuGroupTemplate.java 2008-10-15 16:23:34 UTC (rev 10860)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesMenuGroupTemplate.java 2008-10-15 16:23:38 UTC (rev 10861)
@@ -29,22 +29,29 @@
public class RichFacesMenuGroupTemplate extends VpeAbstractTemplate {
- public static final String MENU_GROUP_ID = "MENU-GROUP-ID"; //$NON-NLS-1$
-
/*
* rich:menuGroup constants
*/
- private final static String COMPONENT_NAME = "menuGroup"; //$NON-NLS-1$
- private final static String STYLE_PATH = "menuGroup/menuGroup.css"; //$NON-NLS-1$
+ private static final String COMPONENT_NAME = "menuGroup"; //$NON-NLS-1$
+ private static final String STYLE_PATH = "menuGroup/menuGroup.css"; //$NON-NLS-1$
private static final String SPACER_IMG_PATH = "menuGroup/spacer.gif"; //$NON-NLS-1$
- private final static String CHILD_GROUP_NAME = ":menuGroup"; //$NON-NLS-1$
- private final static String CHILD_ITEM_NAME = ":menuItem"; //$NON-NLS-1$
+ private static final String FOLDER_IMG_PATH = "menuGroup/arrow.gif"; //$NON-NLS-1$
+ private static final String FOLDER_IMG_WIDTH = "16px;"; //$NON-NLS-1$
+ private static final String FOLDER_IMG_HEIGHT = "16px;"; //$NON-NLS-1$
+ private static final String CHILD_GROUP_NAME = ":menuGroup"; //$NON-NLS-1$
+ private static final String CHILD_ITEM_NAME = ":menuItem"; //$NON-NLS-1$
private static final String ICON_FACET_NAME = "icon"; //$NON-NLS-1$
private static final String ICON_DISABLED_FACET_NAME = "iconDisabled"; //$NON-NLS-1$
private static final String EMPTY = ""; //$NON-NLS-1$
private static final String SPACE = " "; //$NON-NLS-1$
/*
+ * Constants for drop down mechanism.
+ */
+ private static final String MENU_PARENT_ID = "vpe-ddm-menu-ul"; //$NON-NLS-1$
+ private static final String MENU_CHILD_ID = "vpe-ddm-menu-li"; //$NON-NLS-1$
+
+ /*
* rich:menuGroup css styles names
*/
private static final String CSS_RICH_MENU_GROUP = "rich-menu-group"; //$NON-NLS-1$
@@ -63,6 +70,7 @@
private static final String CSS_RICH_MENU_LIST_BG = "rich-menu-list-bg"; //$NON-NLS-1$
private static final String CSS_RICH_LIST_FOLDER_DIV_STYLE = ""; //$NON-NLS-1$
private static final String CSS_RICH_LIST_BORDER_DIV_STYLE = ""; //$NON-NLS-1$
+ private static final String CSS_MENU_GROUP_TOP_DIV = "dr-menu-group-top-div"; //$NON-NLS-1$
/*
* rich:menuGroup attributes names
@@ -123,9 +131,10 @@
nsIDOMElement grTopDiv;
nsIDOMElement grImgSpan;
nsIDOMElement grImg;
+ nsIDOMElement grFolderImg;
nsIDOMElement grLabelSpan;
nsIDOMText grLabelText;
- nsIDOMElement grFolderDiv;
+ nsIDOMElement grFolderImgSpan;
nsIDOMElement grListBorderDiv;
nsIDOMElement grListBgDiv;
@@ -137,9 +146,10 @@
grTopDiv = visualDocument.createElement(HTML.TAG_DIV);
grImgSpan = visualDocument.createElement(HTML.TAG_SPAN);
grImg = visualDocument.createElement(HTML.TAG_IMG);
+ grFolderImg = visualDocument.createElement(HTML.TAG_IMG);
grLabelSpan = visualDocument.createElement(HTML.TAG_SPAN);
grLabelText = visualDocument.createTextNode(EMPTY);
- grFolderDiv = visualDocument.createElement(HTML.TAG_DIV);
+ grFolderImgSpan = visualDocument.createElement(HTML.TAG_SPAN);
grListBorderDiv = visualDocument.createElement(HTML.TAG_DIV);
grListBgDiv = visualDocument.createElement(HTML.TAG_DIV);
creationData = new VpeCreationData(grMainLI);
@@ -150,21 +160,16 @@
grTopDiv.appendChild(grImgSpan);
grTopDiv.appendChild(grLabelSpan);
grLabelSpan.appendChild(grLabelText);
-// grTopDiv.appendChild(grFolderDiv);
+ grTopDiv.appendChild(grFolderImgSpan);
// grFolderDiv.appendChild(grListBorderDiv);
// grListBorderDiv.appendChild(grListBgDiv);
grMainLI.appendChild(grTopDiv);
-
+
/*
- * Children <ul> will be added only if there are some of them.
- */
-// grMainLI.appendChild(grChildrenUL);
-
- /*
* Setting attributes for the drop-down mechanism
*/
- grMainLI.setAttribute(RichFacesDropDownMenuTemplate.MENU_CHILD_ID, EMPTY);
- grChildrenUL.setAttribute(RichFacesDropDownMenuTemplate.MENU_PARENT_ID, EMPTY);
+ grMainLI.setAttribute(MENU_CHILD_ID, EMPTY);
+ grChildrenUL.setAttribute(MENU_PARENT_ID, EMPTY);
/*
* Setting css classes
@@ -190,14 +195,16 @@
labelSpanClass += SPACE + mg_labelClass;
}
-// grTopDiv.setAttribute(HTML.CLASS_ATTR, topDivClass);
+// grTopDiv.setAttribute(HTML.ATTR_CLASS, topDivClass);
+ grTopDiv.setAttribute(HTML.ATTR_CLASS, CSS_MENU_GROUP_TOP_DIV);
grMainLI.setAttribute(HTML.ATTR_CLASS, topDivClass);
grImgSpan.setAttribute(HTML.ATTR_CLASS, imgSpanClass);
grLabelSpan.setAttribute(HTML.ATTR_CLASS, labelSpanClass);
-// grFolderDiv.setAttribute(HTML.ATTR_CLASS, folderDivClass);
+ grFolderImgSpan.setAttribute(HTML.ATTR_CLASS, folderDivClass);
// grListBorderDiv.setAttribute(HTML.ATTR_CLASS, CSS_RICH_MENU_LIST_BORDER);
// grListBgDiv.setAttribute(HTML.ATTR_CLASS, CSS_RICH_MENU_LIST_BG);
- grChildrenUL.setAttribute(HTML.ATTR_CLASS, folderDivClass + SPACE + CSS_RICH_MENU_LIST_BORDER + SPACE + CSS_RICH_MENU_LIST_BG);
+ grChildrenUL.setAttribute(HTML.ATTR_CLASS, CSS_RICH_MENU_LIST_BORDER
+ + SPACE + CSS_RICH_MENU_LIST_BG);
/*
* Setting css styles
*/
@@ -207,11 +214,12 @@
topDivStyle += SPACE + mg_style;
}
-// grTopDiv.setAttribute(HTML.STYLE_ATTR, topDivStyle);
grMainLI.setAttribute(HTML.ATTR_STYLE, topDivStyle);
-// grFolderDiv.setAttribute(HTML.ATTR_STYLE, CSS_RICH_LIST_FOLDER_DIV_STYLE);
+ grFolderImgSpan.setAttribute(HTML.ATTR_STYLE, CSS_RICH_LIST_FOLDER_DIV_STYLE);
// grListBorderDiv.setAttribute(HTML.ATTR_STYLE, CSS_RICH_LIST_BORDER_DIV_STYLE);
- grChildrenUL.setAttribute(HTML.ATTR_STYLE, CSS_RICH_LIST_FOLDER_DIV_STYLE + SPACE + CSS_RICH_LIST_BORDER_DIV_STYLE);
+// grChildrenUL.setAttribute(HTML.ATTR_STYLE,
+// CSS_RICH_LIST_FOLDER_DIV_STYLE + SPACE
+// + CSS_RICH_LIST_BORDER_DIV_STYLE);
/*
* Encode label value
@@ -231,12 +239,11 @@
childInfo.addSourceChild(iconFacet);
creationData.addChildrenInfo(childInfo);
} else {
- String iconPath = sourceElement.getAttribute(ICON);
- if (attrPresents(iconPath)) {
+ if (attrPresents(mg_icon)) {
/*
* Add path to specified image
*/
- String imgFullPath = VpeStyleUtil.addFullPathToImgSrc(iconPath, pageContext, true);
+ String imgFullPath = VpeStyleUtil.addFullPathToImgSrc(mg_icon, pageContext, true);
grImg.setAttribute(HTML.ATTR_SRC, imgFullPath);
} else {
/*
@@ -252,6 +259,26 @@
}
/*
+ * Add group folder icon
+ */
+ if (attrPresents(mg_iconFolder)) {
+ /*
+ * Add path to specified image
+ */
+ String imgFullPath = VpeStyleUtil.addFullPathToImgSrc(mg_iconFolder, pageContext, true);
+ grFolderImg.setAttribute(HTML.ATTR_SRC, imgFullPath);
+ } else {
+ /*
+ * Create default arrow image
+ */
+ ComponentUtil.setImg(grFolderImg, FOLDER_IMG_PATH);
+ }
+ /*
+ * Add image to group folder div
+ */
+ grFolderImgSpan.appendChild(grFolderImg);
+
+ /*
* Adding child nodes:
* <rich:menuGroup> and <rich:menuItem> only.
*/
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesMenuItemTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesMenuItemTemplate.java 2008-10-15 16:23:34 UTC (rev 10860)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesMenuItemTemplate.java 2008-10-15 16:23:38 UTC (rev 10861)
@@ -29,11 +29,12 @@
public class RichFacesMenuItemTemplate extends VpeAbstractTemplate {
+
/*
* rich:menuItem constants
*/
- private final static String COMPONENT_NAME = "menuItem"; //$NON-NLS-1$
- private final static String STYLE_PATH = "menuItem/menuItem.css"; //$NON-NLS-1$
+ private static final String COMPONENT_NAME = "menuItem"; //$NON-NLS-1$
+ private static final String STYLE_PATH = "menuItem/menuItem.css"; //$NON-NLS-1$
private static final String SPACER_IMG_PATH = "menuItem/spacer.gif"; //$NON-NLS-1$
private static final String ICON_FACET_NAME = "icon"; //$NON-NLS-1$
private static final String ICON_DISABLED_FACET_NAME = "iconDisabled"; //$NON-NLS-1$
@@ -41,6 +42,11 @@
private static final String SPACE = " "; //$NON-NLS-1$
/*
+ * Constants for drop down mechanism.
+ */
+ private static final String MENU_CHILD_ID = "vpe-ddm-menu-li"; //$NON-NLS-1$
+
+ /*
* rich:menuItem css styles names
*/
private static final String CSS_RICH_MENU_ITEM = "rich-menu-item"; //$NON-NLS-1$
@@ -55,6 +61,7 @@
private static final String CSS_RICH_MENU_ITEM_ICON_ENABLED = "rich-menu-item-icon-enabled"; //$NON-NLS-1$
private static final String CSS_RICH_MENU_ITEM_LABEL_SELECTED = "rich-menu-item-label-selected"; //$NON-NLS-1$
private static final String CSS_RICH_MENU_ITEM_ICON_SELECTED = "rich-menu-item-icon-selected"; //$NON-NLS-1$
+ private static final String CSS_MENU_ITEM_TOP_DIV = "dr-menu-item-top-div"; //$NON-NLS-1$
/*
* rich:menuItem attributes names
@@ -128,11 +135,10 @@
itemLabelSpan.appendChild(itemLabelText);
itemMainLI.appendChild(itemTopDiv);
-
/*
* Setting attributes for the drop-down mechanism
*/
- itemMainLI.setAttribute(RichFacesDropDownMenuTemplate.MENU_CHILD_ID, EMPTY);
+ itemMainLI.setAttribute(MENU_CHILD_ID, EMPTY);
/*
* Setting css classes
@@ -156,6 +162,7 @@
}
// itemTopDiv.setAttribute(HTML.ATTR_CLASS, topDivClass);
+ itemTopDiv.setAttribute(HTML.ATTR_CLASS, CSS_MENU_ITEM_TOP_DIV);
itemMainLI.setAttribute(HTML.ATTR_CLASS, topDivClass);
itemIconImgSpan.setAttribute(HTML.ATTR_CLASS, iconImgSpanClass);
itemLabelSpan.setAttribute(HTML.ATTR_CLASS, labelSpanClass);
@@ -200,7 +207,6 @@
* Add image to span
*/
itemIconImgSpan.appendChild(itemIconImg);
-
}
/*
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/templates/vpe-templates-richfaces.xml
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/templates/vpe-templates-richfaces.xml 2008-10-15 16:23:34 UTC (rev 10860)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/templates/vpe-templates-richfaces.xml 2008-10-15 16:23:38 UTC (rev 10861)
@@ -529,10 +529,6 @@
<vpe:tag name="rich:dropDownMenu" case-sensitive="yes" >
<vpe:template class="org.jboss.tools.jsf.vpe.richfaces.template.RichFacesDropDownMenuTemplate"
children="yes" modify="no">
- <vpe:resize>
- <vpe:width width-attr="style.width" />
- <vpe:height height-attr="style.height" />
- </vpe:resize>
<vpe:dnd>
<vpe:drag start-enable="yes"/>
<vpe:drop container="no"/>
@@ -543,10 +539,6 @@
<vpe:tag name="rich:menuItem" case-sensitive="yes" >
<vpe:template class="org.jboss.tools.jsf.vpe.richfaces.template.RichFacesMenuItemTemplate"
children="yes" modify="no">
- <vpe:resize>
- <vpe:width width-attr="style.width" />
- <vpe:height height-attr="style.height" />
- </vpe:resize>
<vpe:dnd>
<vpe:drag start-enable="yes"/>
<vpe:drop container="no"/>
@@ -557,10 +549,6 @@
<vpe:tag name="rich:menuGroup" case-sensitive="yes" >
<vpe:template class="org.jboss.tools.jsf.vpe.richfaces.template.RichFacesMenuGroupTemplate"
children="yes" modify="no">
- <vpe:resize>
- <vpe:width width-attr="style.width" />
- <vpe:height height-attr="style.height" />
- </vpe:resize>
<vpe:dnd>
<vpe:drag start-enable="yes"/>
<vpe:drop container="no"/>
16 years, 3 months
JBoss Tools SVN: r10860 - in trunk/documentation/jbosstools-jdocbook-style/src/main: org/css/images and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: smukhina
Date: 2008-10-15 12:23:34 -0400 (Wed, 15 Oct 2008)
New Revision: 10860
Added:
trunk/documentation/jbosstools-jdocbook-style/src/main/com/css/images/new.png
trunk/documentation/jbosstools-jdocbook-style/src/main/com/css/images/updated.png
trunk/documentation/jbosstools-jdocbook-style/src/main/org/css/images/new.png
trunk/documentation/jbosstools-jdocbook-style/src/main/org/css/images/updated.png
Log:
https://jira.jboss.org/jira/browse/JBDS-424
Added: trunk/documentation/jbosstools-jdocbook-style/src/main/com/css/images/new.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/jbosstools-jdocbook-style/src/main/com/css/images/new.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/jbosstools-jdocbook-style/src/main/com/css/images/updated.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/jbosstools-jdocbook-style/src/main/com/css/images/updated.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/jbosstools-jdocbook-style/src/main/org/css/images/new.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/jbosstools-jdocbook-style/src/main/org/css/images/new.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/jbosstools-jdocbook-style/src/main/org/css/images/updated.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/jbosstools-jdocbook-style/src/main/org/css/images/updated.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
16 years, 3 months
JBoss Tools SVN: r10859 - in trunk: birt/docs/en/images and 12 other directories.
by jbosstools-commits＠lists.jboss.org
Author: smukhina
Date: 2008-10-15 12:21:10 -0400 (Wed, 15 Oct 2008)
New Revision: 10859
Removed:
trunk/as/docs/reference/en/images/new.png
trunk/as/docs/reference/en/images/updated.png
trunk/birt/docs/en/images/new.png
trunk/birt/docs/en/images/updated.png
trunk/documentation/guides/Exadel-migration/en/images/new.png
trunk/documentation/guides/Exadel-migration/en/images/updated.png
trunk/documentation/guides/GettingStartedGuide/en/images/new.png
trunk/documentation/guides/GettingStartedGuide/en/images/updated.png
trunk/esb/docs/esb_ref_guide/en/images/new.png
trunk/esb/docs/esb_ref_guide/en/images/updated.png
trunk/hibernatetools/docs/reference/en/images/new.png
trunk/hibernatetools/docs/reference/en/images/updated.png
trunk/jbpm/docs/reference/en/images/new.png
trunk/jbpm/docs/reference/en/images/updated.png
trunk/jsf/docs/jsf_tools_ref_guide/en/images/new.png
trunk/jsf/docs/jsf_tools_ref_guide/en/images/updated.png
trunk/jsf/docs/jsf_tools_tutorial/en/images/new.png
trunk/jsf/docs/jsf_tools_tutorial/en/images/updated.png
trunk/jsf/docs/userguide/en/images/new.png
trunk/jsf/docs/userguide/en/images/updated.png
trunk/portlet/docs/reference/en/images/new.png
trunk/portlet/docs/reference/en/images/updated.png
trunk/seam/docs/reference/en/images/new.png
trunk/seam/docs/reference/en/images/updated.png
trunk/struts/docs/struts_tools_ref_guide/en/images/new.png
trunk/struts/docs/struts_tools_ref_guide/en/images/updated.png
trunk/struts/docs/struts_tools_tutorial/en/images/new.png
trunk/struts/docs/struts_tools_tutorial/en/images/updated.png
Log:
https://jira.jboss.org/jira/browse/JBDS-424
Deleted: trunk/as/docs/reference/en/images/new.png
===================================================================
(Binary files differ)
Deleted: trunk/as/docs/reference/en/images/updated.png
===================================================================
(Binary files differ)
Deleted: trunk/birt/docs/en/images/new.png
===================================================================
(Binary files differ)
Deleted: trunk/birt/docs/en/images/updated.png
===================================================================
(Binary files differ)
Deleted: trunk/documentation/guides/Exadel-migration/en/images/new.png
===================================================================
(Binary files differ)
Deleted: trunk/documentation/guides/Exadel-migration/en/images/updated.png
===================================================================
(Binary files differ)
Deleted: trunk/documentation/guides/GettingStartedGuide/en/images/new.png
===================================================================
(Binary files differ)
Deleted: trunk/documentation/guides/GettingStartedGuide/en/images/updated.png
===================================================================
(Binary files differ)
Deleted: trunk/esb/docs/esb_ref_guide/en/images/new.png
===================================================================
(Binary files differ)
Deleted: trunk/esb/docs/esb_ref_guide/en/images/updated.png
===================================================================
(Binary files differ)
Deleted: trunk/hibernatetools/docs/reference/en/images/new.png
===================================================================
(Binary files differ)
Deleted: trunk/hibernatetools/docs/reference/en/images/updated.png
===================================================================
(Binary files differ)
Deleted: trunk/jbpm/docs/reference/en/images/new.png
===================================================================
(Binary files differ)
Deleted: trunk/jbpm/docs/reference/en/images/updated.png
===================================================================
(Binary files differ)
Deleted: trunk/jsf/docs/jsf_tools_ref_guide/en/images/new.png
===================================================================
(Binary files differ)
Deleted: trunk/jsf/docs/jsf_tools_ref_guide/en/images/updated.png
===================================================================
(Binary files differ)
Deleted: trunk/jsf/docs/jsf_tools_tutorial/en/images/new.png
===================================================================
(Binary files differ)
Deleted: trunk/jsf/docs/jsf_tools_tutorial/en/images/updated.png
===================================================================
(Binary files differ)
Deleted: trunk/jsf/docs/userguide/en/images/new.png
===================================================================
(Binary files differ)
Deleted: trunk/jsf/docs/userguide/en/images/updated.png
===================================================================
(Binary files differ)
Deleted: trunk/portlet/docs/reference/en/images/new.png
===================================================================
(Binary files differ)
Deleted: trunk/portlet/docs/reference/en/images/updated.png
===================================================================
(Binary files differ)
Deleted: trunk/seam/docs/reference/en/images/new.png
===================================================================
(Binary files differ)
Deleted: trunk/seam/docs/reference/en/images/updated.png
===================================================================
(Binary files differ)
Deleted: trunk/struts/docs/struts_tools_ref_guide/en/images/new.png
===================================================================
(Binary files differ)
Deleted: trunk/struts/docs/struts_tools_ref_guide/en/images/updated.png
===================================================================
(Binary files differ)
Deleted: trunk/struts/docs/struts_tools_tutorial/en/images/new.png
===================================================================
(Binary files differ)
Deleted: trunk/struts/docs/struts_tools_tutorial/en/images/updated.png
===================================================================
(Binary files differ)
16 years, 3 months
JBoss Tools SVN: r10858 - trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2008-10-15 10:36:48 -0400 (Wed, 15 Oct 2008)
New Revision: 10858
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesComboBoxTemplate.java
Log:
Minor changes
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesComboBoxTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesComboBoxTemplate.java 2008-10-15 14:34:45 UTC (rev 10857)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesComboBoxTemplate.java 2008-10-15 14:36:48 UTC (rev 10858)
@@ -59,9 +59,6 @@
public boolean isRecreateAtAttrChange(VpePageContext pageContext,
Element sourceElement, nsIDOMDocument visualDocument,
nsIDOMElement visualNode, Object data, String name, String value) {
- // TODO Auto-generated method stub
return true;
}
-
-
}
16 years, 3 months
JBoss Tools SVN: r10857 - in trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor: util and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2008-10-15 10:34:45 -0400 (Wed, 15 Oct 2008)
New Revision: 10857
Added:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VpeClassUtil.java
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpePanelGridCreator.java
Log:
Method getClasses extracted from VpePanelGridCreator and placed into new class VpeClassUtil.
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpePanelGridCreator.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpePanelGridCreator.java 2008-10-15 14:21:11 UTC (rev 10856)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpePanelGridCreator.java 2008-10-15 14:34:45 UTC (rev 10857)
@@ -23,6 +23,7 @@
import org.jboss.tools.vpe.editor.template.expression.VpeExpressionInfo;
import org.jboss.tools.vpe.editor.template.expression.VpeValue;
import org.jboss.tools.vpe.editor.util.HTML;
+import org.jboss.tools.vpe.editor.util.VpeClassUtil;
import org.mozilla.interfaces.nsIDOMAttr;
import org.mozilla.interfaces.nsIDOMDocument;
import org.mozilla.interfaces.nsIDOMElement;
@@ -350,9 +351,9 @@
.createElement(HTML.TAG_TBODY);
visualTable.appendChild(visualBody);
- List rowClasses = getClasses(rowClassesExpr, sourceNode,
+ List<String> rowClasses = VpeClassUtil.getClasses(rowClassesExpr, sourceNode,
pageContext);
- List columnClasses = getClasses(columnClassesExpr, sourceNode,
+ List<String> columnClasses = VpeClassUtil.getClasses(columnClassesExpr, sourceNode,
pageContext);
int rci = 0; // index of row class
@@ -421,22 +422,6 @@
return creatorInfo;
}
- private List getClasses(VpeExpression expression, Node sourceNode,
- VpePageContext pageContext) throws VpeExpressionException {
- List b = new ArrayList();
- if (expression != null && sourceNode != null) {
- String classes = expression.exec(pageContext, sourceNode)
- .stringValue();
- String[] a = classes.split(",");
- for (int i = 0; i < a.length; i++) {
- if (a[i].trim().length() > 0) {
- b.add(a[i].trim());
- }
- }
- }
- return b;
- }
-
private void makeSpecial(Node header, nsIDOMElement visualHead,
nsIDOMDocument visualDocument, int tableSize,
VpeCreatorInfo creatorInfo, String cellTag,
Added: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VpeClassUtil.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VpeClassUtil.java (rev 0)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VpeClassUtil.java 2008-10-15 14:34:45 UTC (rev 10857)
@@ -0,0 +1,57 @@
+/*******************************************************************************
+ * 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.vpe.editor.util;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.jboss.tools.vpe.editor.context.VpePageContext;
+import org.jboss.tools.vpe.editor.template.expression.VpeExpression;
+import org.jboss.tools.vpe.editor.template.expression.VpeExpressionException;
+import org.w3c.dom.Node;
+
+/**
+ * @author yradtsevich
+ *
+ */
+public class VpeClassUtil {
+ /**
+ *
+ */
+ private static final String CLASSES_DELIMITER = ","; //$NON-NLS-1$
+
+ /**
+ * Extracts class names from <code>sourceNode</code> specified by a string given
+ * by <code>expression</code>
+ *
+ * @param expression
+ * @param sourceNode
+ * @param pageContext
+ * @return names of style classes
+ * @throws VpeExpressionException
+ */
+ public static List<String> getClasses(VpeExpression expression, Node sourceNode,
+ VpePageContext pageContext) throws VpeExpressionException {
+ List<String> ret = new ArrayList<String>();
+ if (expression != null && sourceNode != null) {
+ String classes = expression.exec(pageContext, sourceNode)
+ .stringValue();
+ String[] a = classes.split(CLASSES_DELIMITER);
+ for (int i = 0; i < a.length; i++) {
+ String className = a[i].trim();
+ if (className.length() > 0) {
+ ret.add(className);
+ }
+ }
+ }
+ return ret;
+ }
+}
16 years, 3 months
JBoss Tools SVN: r10856 - trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-10-15 10:21:11 -0400 (Wed, 15 Oct 2008)
New Revision: 10856
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/ObjectMultiPageEditor.java
Log:
Selection improved
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/ObjectMultiPageEditor.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/ObjectMultiPageEditor.java 2008-10-15 14:13:26 UTC (rev 10855)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/ObjectMultiPageEditor.java 2008-10-15 14:21:11 UTC (rev 10856)
@@ -831,6 +831,7 @@
protected void pageChange(int newPageIndex) {
deactivateSite(false, false);
+ boolean isText = selectedPageIndex == getSourcePageIndex();
selectedPageIndex = newPageIndex;
Control control = getControl(newPageIndex);
if (control != null) {
@@ -848,7 +849,7 @@
if(postponedTextSelection.selected != null) {
Display.getDefault().asyncExec(postponedTextSelection);
}
- if(newPageIndex != getSourcePageIndex()) {
+ if(isText && newPageIndex != getSourcePageIndex()) {
synchronizeSelectionWithText();
}
activateSite();
16 years, 3 months
JBoss Tools SVN: r10855 - trunk/as/docs/reference/en/modules.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2008-10-15 10:13:26 -0400 (Wed, 15 Oct 2008)
New Revision: 10855
Modified:
trunk/as/docs/reference/en/modules/webtools.xml
Log:
https://jira.jboss.org/jira/browse/JBDS-446- updating the 'Adding Facets to a Project' section;
Modified: trunk/as/docs/reference/en/modules/webtools.xml
===================================================================
--- trunk/as/docs/reference/en/modules/webtools.xml 2008-10-15 14:12:00 UTC (rev 10854)
+++ trunk/as/docs/reference/en/modules/webtools.xml 2008-10-15 14:13:26 UTC (rev 10855)
@@ -2,10 +2,10 @@
<chapter id="webtools">
<title>Projects</title>
<para>The most popular of the projects we deal with are the J2EE ones, such as Dynamic Web
- Project, EJB Project, or EAR project. Web projects of JBoss Tools are Struts, JSF and Seam
- projects. All of them are called faceted projects. Thus, in this chapter we are going to
- tell you about facets the main benefit of which to provide proper structuring and packaging
- for any type of project.</para>
+ Project, EJB Project, or EAR project. Web projects of <property>JBoss Tools</property> are
+ Struts, JSF and Seam projects. All of them are called faceted projects. Thus, in this
+ chapter we are going to tell you about facets the main benefit of which to provide proper
+ structuring and packaging for any type of project.</para>
<section>
<title>Faceted Projects Overview</title>
@@ -33,33 +33,16 @@
<section revisionflag="changed">
<title>Adding Facets to a Project</title>
- <para>There are two ways to add facets to a project. The first way is to include facets into
- already existing project. For that you should bring up the context menu for selected
- project and click <emphasis>
- <property>Properties</property>.
- </emphasis> At this point, choose <emphasis>
- <property>Project Facets</property>
- </emphasis> from the left. It will represent a list of the facets for your project and
- give opportunity to modify it by clicking on <emphasis>
- <property>Modify Project...</property>
- </emphasis> button.</para>
+ <para>In this section we're going to consider the facets added by <property>JBoss
+ Tools</property> and show how you can configure them in a project: add new ones or
+ modify already existing configuration of the facets.</para>
- <figure>
- <title>Adding Facets to the Existing Project</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/webtools/webtools_0.png"/>
- </imageobject>
- </mediaobject>
- </figure>
-
- <para> The other way is adding necessary facets while organizing a new project. To
- demonstrate it let's create a new <property>Dynamic Web Project</property>
- selecting as usual <emphasis>
+ <para>One way to configure the facets is doing it while organizing a new project. To
+ demonstrate this let's create a new <property>Dynamic Web Project</property> by
+ selecting <emphasis>
<property>File > New > Other...</property>
</emphasis> and then <emphasis>
- <property>Web > Dynamic Web Project</property>.
- </emphasis></para>
+ <property>Web > Dynamic Web Project</property>. </emphasis></para>
<figure>
<title>New Dynamic Web Project</title>
<mediaobject>
@@ -70,37 +53,65 @@
</figure>
<para>Click <emphasis>
<property>Next</property>
- </emphasis> and you will see Dynamic Web Project page.</para>
- <figure>
- <title>Faceted Project Wizard: First Page</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/webtools/webtools_2.png"/>
- </imageobject>
- </mediaobject>
- </figure>
+ </emphasis> and you will see Dynamic Web Project page like on the figure below.</para>
+
<para> The first page of most WTP projects allows you to target a specific runtime,
representing a server's library location. It will also provide you the ability to add
this project to an EAR project, and select a pre-selected default set of facets, called
a configuration, rather than manually select each facet you might want.</para>
<para> Selecting the runtime, again, allows the project to install the proper classpaths to
the project so it knows what code to compile against.</para>
- <figure>
- <title>Faceted Project Wizard: Second Page</title>
+
+ <figure id="dyn_web_project">
+ <title>New Dynamic Web Project</title>
<mediaobject>
<imageobject>
+ <imagedata fileref="images/webtools/webtools_2.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>Click on the <emphasis>
+ <property>Modify</property>
+ </emphasis> button next to <property>Configuration</property> section in order to open
+ the wizard which allows you to modify a chosen configuration. The wizard looks as
+ follows.</para>
+
+ <figure id="project_facets">
+ <title>Project Facets Wizard</title>
+ <mediaobject>
+ <imageobject>
<imagedata fileref="images/webtools/webtools_3.png"/>
</imageobject>
</mediaobject>
</figure>
- <para> The second page of the wizard allows you to enable or disable specific facets, as
- described above. Some facets may require others, and some may conflict with others, but
- on the whole this page allows you to add any number of facets that don't
- conflict with each other. It means that the list doesn't show those facets that
- couldn't be in the same project. To view the information on limitations and
- requirements for the chosen facet right-click on the facet and press <emphasis>
- <property>Show Constraints</property>.</emphasis></para>
+ <para>Here part of the listed facets are those which are provided by WTP. Some of them are
+ added by <property>JBoss Tools</property>. They are:</para>
+ <itemizedlist>
+ <listitem>
+ <para>BIRT Charting Runtime Component</para>
+ </listitem>
+ <listitem>
+ <para>BIRT Reporting Runtime Component</para>
+ </listitem>
+ <listitem>
+ <para>JBoss ESB</para>
+ </listitem>
+ <listitem>
+ <para>JBoss Portlets</para>
+ </listitem>
+ <listitem>
+ <para>JBoss Web Services</para>
+ </listitem>
+ <listitem>
+ <para>Seam</para>
+ </listitem>
+ </itemizedlist>
+
+ <para>On this wizard page you can enable or disable any facet as well as change it version.
+ What you should note here is that some facets or facets versions may conflict with each
+ other. In case of incompatibility you'll be prompted about this in the combo
+ box underneath.</para>
<figure>
<title>Facet Constraints</title>
<mediaobject>
@@ -109,21 +120,44 @@
</imageobject>
</mediaobject>
</figure>
-
- <para>Notice that here it is also possible to change the version of any facet. If
- the chosen version isn't compatible with any other facet version, you'll be prompted
- about this in the combo box underneath.</para>
-
+ <para>When switching on the <emphasis>
+ <property>Runtimes</property>
+ </emphasis> tab on the right you'll see the currant Server Runtime.</para>
<figure>
- <title>Facet Constraints</title>
+ <title>Runtimes on the Project Facets Wizard</title>
<mediaobject>
<imageobject>
<imagedata fileref="images/webtools/webtools_5.png"/>
</imageobject>
</mediaobject>
</figure>
- <para> Further pages in the wizard are specific to either the project type, or the facets
- selected.</para>
+ <para>On this tab you can also create a new Server Runtime and make it primary by pressing <emphasis>
+ <property>Make Primary</property>
+ </emphasis> button after enabling it.</para>
+ <para>Clicking on <emphasis>
+ <property>OK</property>
+ </emphasis> will save the chosen configuration of the facets and return you to the <link
+ linkend="dyn_web_project">Dynamic Web Project wizard</link>. Further pages in the
+ wizard are specific to either the project type or the facets selected.</para>
+
+
+ <para>If you need to configure the facets for the existing project, you should bring up the
+ context menu for selected project and click <emphasis>
+ <property>Properties</property>
+ </emphasis> and then <emphasis>
+ <property>Project Facets</property>. </emphasis> This will bring up the familiar
+ <link linkend="project_facets">Project Facets wizard</link>, where you can create
+ your own custom facets configuration.</para>
+
+ <para/>
+
</section>
+ <section id="rel_resources_links">
+ <title>Relevant Resources Links</title>
+
+ <para>More on the WTP facets you can read in the <ulink
+ url="http://help.eclipse.org/ganymede/index.jsp?topic=/org.eclipse.jst.j2ee.do..."
+ >eclipse help</ulink>.</para>
+ </section>
</chapter>
16 years, 3 months
JBoss Tools SVN: r10854 - trunk/as/docs/reference/en/images/webtools.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2008-10-15 10:12:00 -0400 (Wed, 15 Oct 2008)
New Revision: 10854
Modified:
trunk/as/docs/reference/en/images/webtools/webtools_2.png
trunk/as/docs/reference/en/images/webtools/webtools_3.png
trunk/as/docs/reference/en/images/webtools/webtools_4.png
trunk/as/docs/reference/en/images/webtools/webtools_5.png
Log:
https://jira.jboss.org/jira/browse/JBDS-446 - replacing out-of-date screenshots by new ones;
Modified: trunk/as/docs/reference/en/images/webtools/webtools_2.png
===================================================================
(Binary files differ)
Modified: trunk/as/docs/reference/en/images/webtools/webtools_3.png
===================================================================
(Binary files differ)
Modified: trunk/as/docs/reference/en/images/webtools/webtools_4.png
===================================================================
(Binary files differ)
Modified: trunk/as/docs/reference/en/images/webtools/webtools_5.png
===================================================================
(Binary files differ)
16 years, 3 months