JBoss Tools SVN: r4113 - trunk/seam/plugins/org.jboss.tools.seam.core/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2007-10-11 08:12:01 -0400 (Thu, 11 Oct 2007)
New Revision: 4113
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/META-INF/MANIFEST.MF
Log:
http://jira.jboss.com/jira/browse/JBIDE-1028 Removed org.eclipse.jpt.core and org.eclipse.jpt.ui from MANIFEST.MF
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/META-INF/MANIFEST.MF 2007-10-11 11:43:08 UTC (rev 4112)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/META-INF/MANIFEST.MF 2007-10-11 12:12:01 UTC (rev 4113)
@@ -36,8 +36,6 @@
org.eclipse.jst.common.project.facet.core,
org.jboss.ide.eclipse.as.core,
org.eclipse.wst.server.core,
- org.eclipse.jpt.core,
- org.eclipse.jpt.ui,
org.eclipse.core.filesystem,
org.eclipse.jst.j2ee.ejb
Provide-Package: org.jboss.tools.seam.core,
17 years, 3 months
JBoss Tools SVN: r4112 - trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template.
by jbosstools-commits＠lists.jboss.org
Author: ezheleznyakov
Date: 2007-10-11 07:43:08 -0400 (Thu, 11 Oct 2007)
New Revision: 4112
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuTemplate.java
Log:
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuTemplate.java 2007-10-11 11:40:37 UTC (rev 4111)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuTemplate.java 2007-10-11 11:43:08 UTC (rev 4112)
@@ -37,16 +37,20 @@
private static final String WIDTH_ATTR_PANELMENU = "width";
private static final String STYLE_ATTR_PANELMENU = "style";
- //private static final String DISABLED_ATTR_PANELMENU = "disabled";
- //private static final String EXPANDSINGLE_ATTR_PANELMENU = "expandSingle";
+ // private static final String DISABLED_ATTR_PANELMENU = "disabled";
+ // private static final String EXPANDSINGLE_ATTR_PANELMENU = "expandSingle";
private static final String STYLECLASS_ATTR_PANELMENU = "styleClass";
- //private static final String PATH_TO_COLLAPSED_GROUP = "/panelMenuGroup/collapsed.gif";
+ private static final String PANEL_MENU_GROUP_END = ":panelMenuGroup";
+ private static final String PANEL_MENU_ITEM_END = ":panelMenuItem";
+ // private static final String PATH_TO_COLLAPSED_GROUP =
+ // "/panelMenuGroup/collapsed.gif";
+
@SuppressWarnings("unchecked")
private static Map toggleMap = new HashMap();
- //private boolean collapsedFalg = false;
+ // private boolean collapsedFalg = false;
// private static final String DISABLED_STYLE_FOR_TABLE = "color:#B1ADA7";
@@ -57,9 +61,10 @@
String width = sourceElement.getAttribute(WIDTH_ATTR_PANELMENU);
String style = sourceElement.getAttribute(STYLE_ATTR_PANELMENU);
- // String disabled = sourceElement.getAttribute(DISABLED_ATTR_PANELMENU);
- // String expandSingle = sourceElement
- // .getAttribute(EXPANDSINGLE_ATTR_PANELMENU);
+ // String disabled =
+ // sourceElement.getAttribute(DISABLED_ATTR_PANELMENU);
+ // String expandSingle = sourceElement
+ // .getAttribute(EXPANDSINGLE_ATTR_PANELMENU);
String styleClass = sourceElement
.getAttribute(STYLECLASS_ATTR_PANELMENU);
@@ -77,31 +82,42 @@
if (styleClass != null) {
div.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, styleClass);
}
-
+
VpeChildrenInfo childrenInfo = new VpeChildrenInfo(div);
List<Node> children = ComponentUtil.getChildren(sourceElement);
int activeId = getActiveId(sourceElement, children);
int i = 0;
-
+
for (Node child : children) {
-
- boolean active = (i == activeId);
-
- if(child.getNodeName().endsWith(":panelMenuGroup")) {
- RichFacesPanelMenuGroupTemplate.encode(pageContext, vpeCreationData, (Element)child, visualDocument, div, active);
- } else if(child.getNodeName().endsWith(":panelMenuItem")) {
- RichFacesPanelMenuItemTemplate.encode(pageContext, vpeCreationData, (Element)child, visualDocument, div, active);
- } else {
- childrenInfo.addSourceChild(child);
+
+ boolean active = true; // (i == activeId);
+
+ if (child.getNodeName().endsWith(PANEL_MENU_GROUP_END)) {
+ RichFacesPanelMenuGroupTemplate.encode(pageContext,
+ vpeCreationData, (Element) child, visualDocument, div,
+ active);
+ } else if (child.getNodeName().endsWith(PANEL_MENU_ITEM_END)) {
+ RichFacesPanelMenuItemTemplate.encode(pageContext,
+ vpeCreationData, (Element) child, visualDocument, div,
+ active);
}
+ if (child.getNodeName().endsWith(":panelMenuGroup")) {
+ RichFacesPanelMenuGroupTemplate.encode(pageContext,
+ vpeCreationData, (Element) child, visualDocument, div,
+ active);
+ } else if (child.getNodeName().endsWith(":panelMenuItem")) {
+ RichFacesPanelMenuItemTemplate.encode(pageContext,
+ vpeCreationData, (Element) child, visualDocument, div,
+ active);
+ } else {
+ childrenInfo.addSourceChild(child);
+ }
i++;
- }
+ }
return vpeCreationData;
}
-
-
-
+
/**
*
* @param sourceElement
@@ -135,13 +151,13 @@
private int getChildrenCount(List<Node> children) {
int count = 0;
for (Node child : children) {
- if (child.getNodeName().endsWith(":panelMenuGroup")) {
+ if (child.getNodeName().endsWith(PANEL_MENU_GROUP_END)) {
count++;
}
}
return count;
}
-
+
public void toggle(VpeVisualDomBuilder builder, Node sourceNode,
String toggleId) {
toggleMap.put(sourceNode, toggleId);
17 years, 3 months
JBoss Tools SVN: r4111 - trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template.
by jbosstools-commits＠lists.jboss.org
Author: asakharov
Date: 2007-10-11 07:40:37 -0400 (Thu, 11 Oct 2007)
New Revision: 4111
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuGroupTemplate.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuTemplate.java
Log:
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuGroupTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuGroupTemplate.java 2007-10-11 11:38:36 UTC (rev 4110)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuGroupTemplate.java 2007-10-11 11:40:37 UTC (rev 4111)
@@ -57,7 +57,7 @@
RichFacesPanelMenuGroupTemplate.encode(pageContext, creationData, (Element)child, visualDocument, div, false);
}
if(child.getNodeName().endsWith(":panelMenuItem")){
- RichFacesPanelMenuItemTemplate.encode(creationData, (Element)child, visualDocument, div, false);
+ RichFacesPanelMenuItemTemplate.encode(pageContext, creationData, (Element)child, visualDocument, div, false);
}
childInfo.addSourceChild(child);
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuTemplate.java 2007-10-11 11:38:36 UTC (rev 4110)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuTemplate.java 2007-10-11 11:40:37 UTC (rev 4111)
@@ -88,9 +88,9 @@
boolean active = (i == activeId);
if(child.getNodeName().endsWith(":panelMenuGroup")) {
- RichFacesPanelMenuGroupTemplate.encode(vpeCreationData, (Element)child, visualDocument, div, active);
+ RichFacesPanelMenuGroupTemplate.encode(pageContext, vpeCreationData, (Element)child, visualDocument, div, active);
} else if(child.getNodeName().endsWith(":panelMenuItem")) {
- RichFacesPanelMenuItemTemplate.encode(vpeCreationData, (Element)child, visualDocument, div, active);
+ RichFacesPanelMenuItemTemplate.encode(pageContext, vpeCreationData, (Element)child, visualDocument, div, active);
} else {
childrenInfo.addSourceChild(child);
}
17 years, 3 months
JBoss Tools SVN: r4110 - trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template.
by jbosstools-commits＠lists.jboss.org
Author: asakharov
Date: 2007-10-11 07:38:36 -0400 (Thu, 11 Oct 2007)
New Revision: 4110
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuItemTemplate.java
Log:
vpe richFaces panelMenuItem
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuItemTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuItemTemplate.java 2007-10-11 11:35:01 UTC (rev 4109)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuItemTemplate.java 2007-10-11 11:38:36 UTC (rev 4110)
@@ -26,7 +26,7 @@
public class RichFacesPanelMenuItemTemplate extends VpeAbstractTemplate {
- //private static final String STYLE_PATH = "/panelMenuItem/style.css";
+ private static final String STYLE_PATH = "/panelMenuItem/style.css";
private static final String PANEL_MENU_ITEM_CLASS = "dr-pmenu-item";
@@ -48,12 +48,12 @@
public VpeCreationData create(VpePageContext pageContext, Node sourceNode,
Document visualDocument) {
- return encode(null,(Element)sourceNode, visualDocument, null, false);
+ return encode(pageContext, null,(Element)sourceNode, visualDocument, null, false);
}
- public static VpeCreationData encode(VpeCreationData creationData, Element sourceElement, Document visualDocument, Element parentVisualElement, boolean active){
+ public static VpeCreationData encode(VpePageContext pageContext,VpeCreationData creationData, Element sourceElement, Document visualDocument, Element parentVisualElement, boolean active){
- //ComponentUtil.setCSSLink(pageContext, STYLE_PATH, PANEL_MENU_ITEM);
+ ComponentUtil.setCSSLink(pageContext, STYLE_PATH, PANEL_MENU_ITEM);
Element div = visualDocument
.createElement(HtmlComponentUtil.HTML_TAG_DIV);
17 years, 3 months
JBoss Tools SVN: r4109 - trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template.
by jbosstools-commits＠lists.jboss.org
Author: asakharov
Date: 2007-10-11 07:35:01 -0400 (Thu, 11 Oct 2007)
New Revision: 4109
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuItemTemplate.java
Log:
vpe richFaces panelMenuItem
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuItemTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuItemTemplate.java 2007-10-11 11:33:03 UTC (rev 4108)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuItemTemplate.java 2007-10-11 11:35:01 UTC (rev 4109)
@@ -26,7 +26,7 @@
public class RichFacesPanelMenuItemTemplate extends VpeAbstractTemplate {
- private static final String STYLE_PATH = "/panelMenuItem/style.css";
+ //private static final String STYLE_PATH = "/panelMenuItem/style.css";
private static final String PANEL_MENU_ITEM_CLASS = "dr-pmenu-item";
@@ -44,20 +44,22 @@
private static final String IMG_SPACER_SRC = "/panelMenuItem/spacer.gif";
- private static final String EMPTY_DIV_STYLE = "display: none;";
+ //private static final String EMPTY_DIV_STYLE = "display: none;";
public VpeCreationData create(VpePageContext pageContext, Node sourceNode,
Document visualDocument) {
-
- ComponentUtil.setCSSLink(pageContext, STYLE_PATH, PANEL_MENU_ITEM);
-
- Element sourceElement = (Element) sourceNode;
-
+ return encode(null,(Element)sourceNode, visualDocument, null, false);
+ }
+
+ public static VpeCreationData encode(VpeCreationData creationData, Element sourceElement, Document visualDocument, Element parentVisualElement, boolean active){
+
+ //ComponentUtil.setCSSLink(pageContext, STYLE_PATH, PANEL_MENU_ITEM);
+
Element div = visualDocument
.createElement(HtmlComponentUtil.HTML_TAG_DIV);
- div.setAttribute("style", EMPTY_DIV_STYLE);
+ //div.setAttribute("style", EMPTY_DIV_STYLE);
div.setAttribute("vpeSupport", PANEL_MENU_ITEM);
- VpeCreationData creationData = new VpeCreationData(div);
+ creationData = new VpeCreationData(div);
if (sourceElement.getParentNode().getNodeName().endsWith(
":panelMenuGroup")
|| (sourceElement.getParentNode().getNodeName()
@@ -65,10 +67,10 @@
Element table = visualDocument
.createElement(HtmlComponentUtil.HTML_TAG_TABLE);
div.appendChild(table);
- table.setAttribute("class", PANEL_MENU_ITEM_CLASS);
- table.setAttribute("cellpadding", NO_SIZE_VALUE);
- table.setAttribute("cellspacing", NO_SIZE_VALUE);
- table.setAttribute("border", NO_SIZE_VALUE);
+ table.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, PANEL_MENU_ITEM_CLASS);
+ table.setAttribute(HtmlComponentUtil.HTML_CELLPADDING_ATTR, NO_SIZE_VALUE);
+ table.setAttribute(HtmlComponentUtil.HTML_CELLSPACING_ATTR, NO_SIZE_VALUE);
+ table.setAttribute(HtmlComponentUtil.HTML_BORDER_ATTR, NO_SIZE_VALUE);
Element tr = visualDocument
.createElement(HtmlComponentUtil.HTML_TAG_TR);
@@ -77,31 +79,31 @@
Element tdNowrap = visualDocument
.createElement(HtmlComponentUtil.HTML_TAG_TD);
tr.appendChild(tdNowrap);
- tdNowrap.setAttribute("class", PANEL_MENU_NOWARP_CLASS);
+ tdNowrap.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, PANEL_MENU_NOWARP_CLASS);
Element imgSpacer1 = visualDocument
.createElement(HtmlComponentUtil.HTML_TAG_IMG);
tdNowrap.appendChild(imgSpacer1);
- imgSpacer1.setAttribute("width", DEFAULT_SIZE_VALUE);
+ imgSpacer1.setAttribute(HtmlComponentUtil.HTML_ATR_WIDTH, DEFAULT_SIZE_VALUE);
imgSpacer1.setAttribute("vspace", NO_SIZE_VALUE);
imgSpacer1.setAttribute("hspace", NO_SIZE_VALUE);
- imgSpacer1.setAttribute("height", DEFAULT_SIZE_VALUE);
+ imgSpacer1.setAttribute(HtmlComponentUtil.HTML_ATR_HEIGHT, DEFAULT_SIZE_VALUE);
ComponentUtil.setImg(imgSpacer1, IMG_SPACER_SRC);
Element imgPoints = visualDocument
.createElement(HtmlComponentUtil.HTML_TAG_IMG);
tdNowrap.appendChild(imgPoints);
- imgPoints.setAttribute("width", DEFAULT_SIZE_VALUE);
+ imgPoints.setAttribute(HtmlComponentUtil.HTML_ATR_WIDTH, DEFAULT_SIZE_VALUE);
imgPoints.setAttribute("vspace", NO_SIZE_VALUE);
imgPoints.setAttribute("hspace", NO_SIZE_VALUE);
- imgPoints.setAttribute("height", DEFAULT_SIZE_VALUE);
+ imgPoints.setAttribute(HtmlComponentUtil.HTML_ATR_HEIGHT, DEFAULT_SIZE_VALUE);
ComponentUtil.setImg(imgPoints, IMG_POINTS_SRC);
Element tdLable = visualDocument
.createElement(HtmlComponentUtil.HTML_TAG_TD);
tr.appendChild(tdLable);
- tdLable.setAttribute("class", PANEL_MENU_LABLE_CLASS);
- tdLable.setAttribute("style", "element.style");
+ tdLable.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, PANEL_MENU_LABLE_CLASS);
+ tdLable.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR, "element.style");
String value = sourceElement.getAttribute("label");
Text text = visualDocument.createTextNode(value == null ? ""
: value);
@@ -114,10 +116,10 @@
Element imgSpacer2 = visualDocument
.createElement(HtmlComponentUtil.HTML_TAG_IMG);
td.appendChild(imgSpacer2);
- imgSpacer2.setAttribute("width", DEFAULT_SIZE_VALUE);
+ imgSpacer2.setAttribute(HtmlComponentUtil.HTML_ATR_WIDTH, DEFAULT_SIZE_VALUE);
imgSpacer2.setAttribute("vspace", NO_SIZE_VALUE);
imgSpacer2.setAttribute("hspace", NO_SIZE_VALUE);
- imgSpacer2.setAttribute("height", DEFAULT_SIZE_VALUE);
+ imgSpacer2.setAttribute(HtmlComponentUtil.HTML_ATR_HEIGHT, DEFAULT_SIZE_VALUE);
ComponentUtil.setImg(imgSpacer2, IMG_SPACER_SRC);
List<Node> children = ComponentUtil.getChildren(sourceElement);
@@ -135,8 +137,4 @@
}
return creationData;
}
-
- public static VpeCreationData encode(VpeCreationData creationData, Element sourceElement, Document visualDocument, Element parentVisualElement, boolean active){
- return null;
- }
}
17 years, 3 months
JBoss Tools SVN: r4108 - trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template.
by jbosstools-commits＠lists.jboss.org
Author: amakhtadui
Date: 2007-10-11 07:33:03 -0400 (Thu, 11 Oct 2007)
New Revision: 4108
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuGroupTemplate.java
Log:
Add encode method.
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuGroupTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuGroupTemplate.java 2007-10-11 06:34:34 UTC (rev 4107)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuGroupTemplate.java 2007-10-11 11:33:03 UTC (rev 4108)
@@ -15,57 +15,67 @@
public class RichFacesPanelMenuGroupTemplate extends VpeAbstractTemplate {
- private static String PANEL_MENU_GROUP_SPACER = "/panelMenuGroup/spacer.gif";
+ private static final String DEFAULT_PANEL_MENU_GROUP_SPACER = "/panelMenuGroup/spacer.gif";
- private static String PANEL_MENU_GROUP_POINTER = "/panelMenuGroup/pointer.gif";
+ private static final String DEFAULT_PANEL_MENU_GROUP_POINTER = "/panelMenuGroup/pointer.gif";
- private static String PANEL_MENU_GROUP_POINT = "/panelMenuGroup/point.gif";
-
- private static String STYLE_PATH = "/panelMenuGroup/style.css";
-
+ private static final String DEFAULT_PANEL_MENU_GROUP_POINT = "/panelMenuGroup/point.gif";
+
+ private static final String STYLE_PATH = "/panelMenuGroup/style.css";
+
+ private static final String ICON_WIDTH = "16";
+
+ private static final String ICON_HEIGHT = "16";
+
+ private static final String ICON_VSPACE = "0";
+
+ private static final String ICON_HSPACE = "0";
+
public VpeCreationData create(VpePageContext pageContext, Node sourceNode, Document visualDocument) {
+ return new VpeCreationData(visualDocument.createElement(HtmlComponentUtil.HTML_TAG_DIV));
+ }
+ public static VpeCreationData encode(VpePageContext pageContext, VpeCreationData creationData, Element sourceElement, Document visualDocument, Element parentVisualElement, boolean expanded) {
ComponentUtil.setCSSLink(pageContext, STYLE_PATH, "panelMenuGroup");
Element div = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_DIV);
- VpeCreationData creationData = new VpeCreationData(div);
+ parentVisualElement.appendChild(div);
+
+ div.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, "dr-pmenu-top-group-div");
+ div.setAttribute("vpeSupport", "panelMenuGroup");
+ buildTable(sourceElement, visualDocument, div);
+
+ List<Node> children = ComponentUtil.getChildren(sourceElement);
- if (checkPanelMenuParent(sourceNode)) {
- div.setAttribute("class", "dr-pmenu-top-group-div");
- div.setAttribute("vpeSupport", "panelMenuGroup");
-
- buildTable(sourceNode, visualDocument, div);
-
- Element sourceElement = (Element) sourceNode;
-
- List<Node> children = ComponentUtil.getChildren(sourceElement);
-
- if (!children.isEmpty()) {
- VpeChildrenInfo childInfo = new VpeChildrenInfo(div);
- for (Node child : children) {
+ if (!children.isEmpty()) {
+ VpeChildrenInfo childInfo = new VpeChildrenInfo(div);
+ for (Node child : children) {
+ if(!expanded && !child.getNodeName().endsWith(":panelMenuGroup") && !child.getNodeName().endsWith(":panelMenuItem")) {
childInfo.addSourceChild(child);
+ } else {
+ if(child.getNodeName().endsWith(":panelMenuGroup")) {
+ RichFacesPanelMenuGroupTemplate.encode(pageContext, creationData, (Element)child, visualDocument, div, false);
+ }
+ if(child.getNodeName().endsWith(":panelMenuItem")){
+ RichFacesPanelMenuItemTemplate.encode(creationData, (Element)child, visualDocument, div, false);
+ }
+ childInfo.addSourceChild(child);
}
- creationData.addChildrenInfo(childInfo);
}
- } else {
- div.setAttribute("style", "display:none;");
+ creationData.addChildrenInfo(childInfo);
}
return creationData;
}
-
- public static VpeCreationData encode(VpeCreationData creationData, Element sourceElement, Document visualDocument, Element parentVisualElement, boolean active) {
- return null;
- }
- private void buildTable(Node sourceNode, Document visualDocument, Element div) {
- Node parent = getRichPanelParent(sourceNode);
+ private static final void buildTable(Element sourceElement, Document visualDocument, Element div) {
+ Node parent = getRichPanelParent(sourceElement);
- Element table = visualDocument.createElement("table");
+ Element table = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_TABLE);
div.appendChild(table);
- table.setAttribute("cellspacing", "0");
- table.setAttribute("cellpadding", "0");
- table.setAttribute("border", "0");
+ table.setAttribute(HtmlComponentUtil.HTML_CELLSPACING_ATTR, "0");
+ table.setAttribute(HtmlComponentUtil.HTML_CELLPADDING_ATTR, "0");
+ table.setAttribute(HtmlComponentUtil.HTML_BORDER_ATTR, "0");
Element tableBody = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_TR);
table.appendChild(tableBody);
@@ -75,16 +85,16 @@
Element img1 = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_IMG);
column1.appendChild(img1);
- img1.setAttribute("width", "16");
- img1.setAttribute("vspace", "0");
- img1.setAttribute("hspace", "0");
- img1.setAttribute("height", "16");
+ img1.setAttribute(HtmlComponentUtil.HTML_WIDTH_ATTR, ICON_WIDTH);
+ img1.setAttribute(HtmlComponentUtil.HTML_HEIGHT_ATTR, ICON_HEIGHT);
+ img1.setAttribute("vspace", ICON_VSPACE);
+ img1.setAttribute("hspace", ICON_HSPACE);
Element column2 = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_TD);
tableBody.appendChild(column2);
- column2.setAttribute("style", "width: 100%;");
+ column2.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR, "width: 100%;");
- Text name = visualDocument.createTextNode(sourceNode.getAttributes().getNamedItem("label").getNodeValue());
+ Text name = visualDocument.createTextNode(sourceElement.getAttribute("label"));
column2.appendChild(name);
Element column3 = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_TD);
@@ -92,46 +102,28 @@
Element img2 = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_IMG);
column3.appendChild(img2);
- img2.setAttribute("width", "16");
- img2.setAttribute("vspace", "0");
- img2.setAttribute("hspace", "0");
- img2.setAttribute("height", "16");
+ img2.setAttribute(HtmlComponentUtil.HTML_WIDTH_ATTR, ICON_WIDTH);
+ img2.setAttribute(HtmlComponentUtil.HTML_HEIGHT_ATTR, ICON_WIDTH);
+ img2.setAttribute("vspace", ICON_VSPACE);
+ img2.setAttribute("hspace", ICON_HSPACE);
if (parent.getNodeName().endsWith(":panelMenu")) {
- ComponentUtil.setImg(img1, PANEL_MENU_GROUP_SPACER);
- ComponentUtil.setImg(img2, PANEL_MENU_GROUP_POINTER);
- column2.setAttribute("class", "dr-pmenu-group-self-label dr-pmenu-selected-item");
- table.setAttribute("class", "dr-pmenu-top-group");
+ ComponentUtil.setImg(img1, DEFAULT_PANEL_MENU_GROUP_SPACER);
+ ComponentUtil.setImg(img2, DEFAULT_PANEL_MENU_GROUP_POINTER);
+ column2.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, "dr-pmenu-group-self-label dr-pmenu-selected-item");
+ table.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, "dr-pmenu-top-group");
} else {
- div.setAttribute("style", "display:none;");
- ComponentUtil.setImg(img1, PANEL_MENU_GROUP_POINT);
- img1.setAttribute("style", "vertical-align: middle");
- ComponentUtil.setImg(img2, PANEL_MENU_GROUP_SPACER);
- column2.setAttribute("class", "dr-pmenu-group rich-pmenu-group");
- table.setAttribute("class", "dr-pmenu-group-self-label rich-pmenu-group-self-label");
+ ComponentUtil.setImg(img1, DEFAULT_PANEL_MENU_GROUP_POINT);
+ img1.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR, "vertical-align: middle");
+ ComponentUtil.setImg(img2, DEFAULT_PANEL_MENU_GROUP_SPACER);
+ column2.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, "dr-pmenu-group rich-pmenu-group");
+ table.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, "dr-pmenu-group-self-label rich-pmenu-group-self-label");
}
}
- private boolean checkPanelMenuParent(Node checkNode) {
- boolean result = false;
+ private static final Node getRichPanelParent(Element sourceElement) {
+ Node parent = sourceElement.getParentNode();
- Node parent = checkNode.getParentNode();
-
- while (parent != null) {
- if (parent.getNodeName().endsWith(":panelMenu")) {
- result = true;
- break;
- }
-
- parent = parent.getParentNode();
- }
-
- return result;
- }
-
- private Node getRichPanelParent(Node sourceNode) {
- Node parent = sourceNode.getParentNode();
-
while (true) {
if (parent.getNodeName().endsWith(":panelMenu") || parent.getNodeName().endsWith(":panelMenuGroup")) {
break;
@@ -139,8 +131,7 @@
parent = parent.getParentNode();
}
}
-
+
return parent;
-
}
}
17 years, 3 months
JBoss Tools SVN: r4107 - in trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui: wizard and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2007-10-11 02:34:34 -0400 (Thu, 11 Oct 2007)
New Revision: 4107
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamProjectWizard.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1013
problem was in SeamFacetPreInstallDelegate that fills some properties in IDataModel instance. That triggered wizard validation and finish button became active. Now wizard notify the page about finish pressed and all validation skipped after that notification.
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java 2007-10-11 05:28:56 UTC (rev 4106)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java 2007-10-11 06:34:34 UTC (rev 4107)
@@ -611,5 +611,12 @@
public void profileDeleted(IConnectionProfile profile) {
// this event never happens
}
+ }
+
+ /**
+ *
+ */
+ public void finishPressed() {
+ model.removeListener(validatorDelegate);
};
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamProjectWizard.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamProjectWizard.java 2007-10-11 05:28:56 UTC (rev 4106)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamProjectWizard.java 2007-10-11 06:34:34 UTC (rev 4107)
@@ -10,10 +10,6 @@
******************************************************************************/
package org.jboss.tools.seam.ui.wizard;
-import java.lang.reflect.InvocationTargetException;
-import java.net.URL;
-
-import org.eclipse.core.runtime.Platform;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.wizard.IWizardPage;
import org.eclipse.jst.servlet.ui.project.facet.WebProjectWizard;
@@ -23,9 +19,8 @@
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
import org.eclipse.wst.common.project.facet.core.IFacetedProjectTemplate;
import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.common.project.facet.ui.PresetSelectionPanel;
import org.jboss.tools.seam.ui.SeamUIMessages;
-import org.osgi.framework.Bundle;
+import org.jboss.tools.seam.ui.internal.project.facet.SeamInstallWizardPage;
/**
*
@@ -57,7 +52,7 @@
@Override
public void createPageControls(Composite container) {
super.createPageControls(container);
- Control control = findGroupByText((Composite)getShell(), SeamUIMessages.SEAM_PROJECT_WIZARD_EAR_MEMBERSHIP);
+ Control control = findGroupByText(getShell(), SeamUIMessages.SEAM_PROJECT_WIZARD_EAR_MEMBERSHIP);
control.setVisible(false);
}
@@ -94,7 +89,18 @@
return "org.jboss.tools.seam.ui.SeamPerspective"; //$NON-NLS-1$
}
+ @Override
protected IFacetedProjectTemplate getTemplate() {
return ProjectFacetsManager.getTemplate("template.jst.seam"); //$NON-NLS-1$
}
+
+ /* (non-Javadoc)
+ * @see org.eclipse.wst.web.ui.internal.wizards.NewProjectDataModelFacetWizard#performFinish()
+ */
+ @Override
+ public boolean performFinish() {
+ SeamInstallWizardPage page = (SeamInstallWizardPage)getPage(SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_SEAM_FACET);
+ page.finishPressed();
+ return super.performFinish();
+ }
}
\ No newline at end of file
17 years, 3 months
JBoss Tools SVN: r4106 - trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2007-10-11 01:28:56 -0400 (Thu, 11 Oct 2007)
New Revision: 4106
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/OpenMappingAction.java
Log:
Fix compilation error
[java] [javac] 18. ERROR in /home/hudson/rhds-build/eclipse/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/OpenMappingAction.java (at line 92)
[java] [javac] Iterator ?\195?\175?\194?\191?\194?\189ollectionMappingsIterator = consoleConfiguration.getConfiguration().getCollectionMappings();
[java] [javac] ^
[java] [javac] Syntax error on token "Invalid Character", delete this token
[java] [javac] 19. ERROR in /home/hudson/rhds-build/eclipse/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/OpenMappingAction.java (at line 93)
[java] [javac] while (?\195?\175?\194?\191?\194?\189ollectionMappingsIterator.hasNext()) {
[java] [javac] ^
[java] [javac] Syntax error on token "Invalid Character", delete this token
[java] [javac] 20. ERROR in /home/hudson/rhds-build/eclipse/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/OpenMappingAction.java (at line 94)
[java] [javac] Collection elem = (Collection) ?\195?\175?\194?\191?\194?\189ollectionMappingsIterator.next();
[java] [javac] Syntax error on token "Invalid Character", delete this token
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/OpenMappingAction.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/OpenMappingAction.java 2007-10-10 22:15:56 UTC (rev 4105)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/OpenMappingAction.java 2007-10-11 05:28:56 UTC (rev 4106)
@@ -89,9 +89,9 @@
}
if (resource == null) {
- Iterator �ollectionMappingsIterator = consoleConfiguration.getConfiguration().getCollectionMappings();
- while (�ollectionMappingsIterator.hasNext()) {
- Collection elem = (Collection) �ollectionMappingsIterator.next();
+ Iterator collectionMappingsIterator = consoleConfiguration.getConfiguration().getCollectionMappings();
+ while (collectionMappingsIterator.hasNext()) {
+ Collection elem = (Collection) collectionMappingsIterator.next();
Table collectionTable = elem.getCollectionTable();
if (HibernateUtils.getTableName(collectionTable).equals(HibernateUtils.getTableName(table))) {
PersistentClass owner = elem.getOwner();
17 years, 3 months
JBoss Tools SVN: r4105 - in trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal: launch and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2007-10-10 18:15:56 -0400 (Wed, 10 Oct 2007)
New Revision: 4105
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServerBehavior.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/JBossServerStartupLaunchConfiguration.java
Log:
JBIDE-1071
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServerBehavior.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServerBehavior.java 2007-10-10 21:17:52 UTC (rev 4104)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServerBehavior.java 2007-10-10 22:15:56 UTC (rev 4105)
@@ -124,6 +124,9 @@
}
+ public void setRunMode(String mode) {
+ setMode(mode);
+ }
public void serverStarting() {
setServerStarting();
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/JBossServerStartupLaunchConfiguration.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/JBossServerStartupLaunchConfiguration.java 2007-10-10 21:17:52 UTC (rev 4104)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/JBossServerStartupLaunchConfiguration.java 2007-10-10 22:15:56 UTC (rev 4105)
@@ -97,6 +97,7 @@
String mode, ILaunch launch, IProgressMonitor monitor) {
try {
JBossServerBehavior jbsBehavior = getServerBehavior(configuration);
+ jbsBehavior.setRunMode(mode);
jbsBehavior.serverStarting();
} catch( CoreException ce ) {
// report it
17 years, 3 months
JBoss Tools SVN: r4104 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/wizards.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2007-10-10 17:17:52 -0400 (Wed, 10 Oct 2007)
New Revision: 4104
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/wizards/NewMBeanWizard.java
Log:
JBIDE-494
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/wizards/NewMBeanWizard.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/wizards/NewMBeanWizard.java 2007-10-10 20:48:57 UTC (rev 4103)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/wizards/NewMBeanWizard.java 2007-10-10 21:17:52 UTC (rev 4104)
@@ -75,6 +75,7 @@
private static String INTERFACE_NAME = "__INTERFACE_NAME__";
public NewMBeanWizard() {
+ setWindowTitle("New MBean Wizard");
}
public void createPageControls(Composite pageContainer) {
17 years, 3 months