JBoss Tools SVN: r9085 - trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template.
by jbosstools-commits＠lists.jboss.org
Author: estherbin
Date: 2008-07-08 07:00:20 -0400 (Tue, 08 Jul 2008)
New Revision: 9085
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesComboBoxTemplate.java
Log:
Fix junit according to http://jira.jboss.com/jira/browse/JBIDE-2430
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-07-08 10:40:14 UTC (rev 9084)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesComboBoxTemplate.java 2008-07-08 11:00:20 UTC (rev 9085)
@@ -250,8 +250,8 @@
thirdDiv.appendChild(forthEmptyDiv);
final VpeCreationData creationData = new VpeCreationData(rootDiv);
- final DOMTreeDumper dumper = new DOMTreeDumper();
- dumper.dumpToStream(System.err, rootDiv);
+// final DOMTreeDumper dumper = new DOMTreeDumper();
+// dumper.dumpToStream(System.err, rootDiv);
return creationData;
}
15 years, 9 months
- 1
- 0
JBoss Tools SVN: r9084 - trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test.
by jbosstools-commits＠lists.jboss.org
Author: estherbin
Date: 2008-07-08 06:40:14 -0400 (Tue, 08 Jul 2008)
New Revision: 9084
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComboBoxTemplateTestCase.java
Log:
Fix junit according to http://jira.jboss.com/jira/browse/JBIDE-2430
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComboBoxTemplateTestCase.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComboBoxTemplateTestCase.java 2008-07-08 10:39:50 UTC (rev 9083)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComboBoxTemplateTestCase.java 2008-07-08 10:40:14 UTC (rev 9084)
@@ -102,8 +102,8 @@
nsIDOMElement divOne = (nsIDOMElement) elements.get(4).queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID);
assertTrue("Style classes should be contains ",divOne.getAttribute(HTML.ATTR_CLASS).contains("rich-combobox-font rich-combobox"));
- assertTrue("Defaule style should be contains " + DEFAULT_WIDTH, divOne.getAttribute(HTML.ATTR_STYLE).indexOf("150") > 1);
- assertTrue("Defaule style should be contains " + DEFAULT_WIDTH, divOne.getAttribute(HTML.ATTR_STYLE).startsWith("width"));
+ assertTrue("Defaule style should be contains " + width, divOne.getAttribute(HTML.ATTR_STYLE).indexOf(width) > 1);
+ assertTrue("Defaule style should be contains " + width, divOne.getAttribute(HTML.ATTR_STYLE).contains("width"));
// Check input
return rst;
15 years, 9 months
- 1
- 0
JBoss Tools SVN: r9083 - trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template.
by jbosstools-commits＠lists.jboss.org
Author: estherbin
Date: 2008-07-08 06:39:50 -0400 (Tue, 08 Jul 2008)
New Revision: 9083
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesComboBoxTemplate.java
Log:
Fix bug http://jira.jboss.com/jira/browse/JBIDE-2430
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-07-08 00:15:46 UTC (rev 9082)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesComboBoxTemplate.java 2008-07-08 10:39:50 UTC (rev 9083)
@@ -39,6 +39,7 @@
import com.sun.org.apache.xerces.internal.impl.xpath.regex.ParseException;
+// TODO: Auto-generated Javadoc
/**
* The Class RichFacesComboBox2Template.
*
@@ -49,6 +50,7 @@
/** CSS_FILE_NAME. */
private static final String CSS_FILE_NAME = "comboBox/comboBox.css";
+ /** The Constant DEFAULT_ALIGN. */
private static final String DEFAULT_ALIGN = "left";
/** DEFAULT_INPUT_SIZE. */
@@ -57,8 +59,10 @@
/** DEFAULT_INPUT_STYLE. */
private static final String DEFAULT_INPUT_STYLE = "rich-combobox-default-input";
+ /** The Constant DEFAULT_LIST_WIDTH. */
private static final String DEFAULT_LIST_WIDTH = "150px";
+ /** The Constant DEFAULT_WIDTH. */
private static final String DEFAULT_WIDTH = "width : 150px";
/** IMAGE_NAME_DOWN. */
@@ -73,52 +77,76 @@
/** The Constant RICH_COMBOBOX_INPUT_CELL_STYLE. */
private static final String RICH_COMBOBOX_INPUT_CELL_STYLE = "rich-combobox-inputCell";
+ /** The Constant SECOND_INPUT. */
private static final String SECOND_INPUT = "secondInput";
/** The Constant STYLE_EXT. */
private static final String STYLE_EXT = "richFacesComboBox";
- private Map<String, String> styleClasess = new HashMap<String, String>();
+ /** The style clasess. */
+ private Map<String, String> styleClasess = new HashMap<String, String>();
/** The Constant ZERO_STRING. */
private static final String ZERO_STRING = "0";
+ /** The source align. */
private String sourceAlign;
+ /** The source button style. */
private String sourceButtonStyle;
+ /** The source default label. */
private String sourceDefaultLabel = null;
+ /** The source list height. */
private String sourceListHeight;
+ /** The source list width. */
private String sourceListWidth;
+ /** The source value. */
private String sourceValue;
+ /** The source width. */
private String sourceWidth;
-
+
+ /** The source style. */
private String sourceStyle;
-
+
+ /** The source input style. */
private String sourceInputStyle;
-
+
+ /** The source input class. */
private String sourceInputClass;
-
+
+ /** The is toggle. */
private boolean isToggle = false;
-
+
+ /** The source list style. */
private String sourceListStyle;
-
+
+ /** The source list class. */
private String sourceListClass;
-
+
+ /** The source item class. */
private String sourceItemClass;
/**
- *
+ * The Constructor.
*/
public RichFacesComboBoxTemplate() {
super();
initDefaultClasses();
}
+ /**
+ * Calculate with for div.
+ *
+ * @param with the with
+ * @param minus the minus
+ *
+ * @return the string
+ */
private String calculateWithForDiv(String with, int minus) {
try {
Integer intValue = 0;
@@ -135,7 +163,15 @@
}
-
+ /**
+ * Create.
+ *
+ * @param visualDocument the visual document
+ * @param sourceNode the source node
+ * @param pageContext the page context
+ *
+ * @return the vpe creation data
+ */
public VpeCreationData create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument) {
ComponentUtil.setCSSLink(pageContext, CSS_FILE_NAME, STYLE_EXT);
@@ -147,23 +183,25 @@
secondDiv.setAttribute("align", this.sourceAlign);
secondDiv.setAttribute(HTML.ATTR_CLASS, styleClasess.get("secondDiv"));
String secondDivSubStyle = "; position: {0}; z-index: {1} ;";
- if(isToggle){
- secondDivSubStyle = MessageFormat.format(secondDivSubStyle, "relative","2");
- }else{
- secondDivSubStyle = MessageFormat.format(secondDivSubStyle,"static","0");
+ if (isToggle) {
+ secondDivSubStyle = MessageFormat.format(secondDivSubStyle, "relative", "2");
+ } else {
+ secondDivSubStyle = MessageFormat.format(secondDivSubStyle, "static", "0");
}
// TODO add ATTR_STYLE.
- secondDiv.setAttribute(HTML.ATTR_STYLE, VpeStyleUtil.PARAMETER_WIDTH + VpeStyleUtil.COLON_STRING + this.sourceListWidth+VpeStyleUtil.SEMICOLON_STRING+secondDivSubStyle+sourceStyle);
+ secondDiv.setAttribute(HTML.ATTR_STYLE, VpeStyleUtil.PARAMETER_WIDTH + VpeStyleUtil.COLON_STRING + this.sourceListWidth
+ + VpeStyleUtil.SEMICOLON_STRING + secondDivSubStyle + sourceStyle);
final nsIDOMElement thirdDiv = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_DIV);
thirdDiv.setAttribute(HTML.ATTR_CLASS, styleClasess.get("thirdDiv"));
thirdDiv.setAttribute(HTML.ATTR_STYLE, VpeStyleUtil.PARAMETER_WIDTH + VpeStyleUtil.COLON_STRING + this.sourceWidth
- + "; z-index: 1;");
+ + "; z-index: 1;");
final nsIDOMElement firstInput = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_INPUT);
firstInput.setAttribute(HTML.ATTR_TYPE, "text");
;
- firstInput.setAttribute(HTML.ATTR_CLASS, styleClasess.get("firstInput")+" "+sourceInputClass);
+ firstInput.setAttribute(HTML.ATTR_CLASS, styleClasess.get("firstInput") + " " + sourceInputClass);
firstInput.setAttribute("autocomplete", "off");
- firstInput.setAttribute(HTML.ATTR_STYLE, "width: " + calculateWithForDiv(this.sourceWidth, 17)+VpeStyleUtil.SEMICOLON_STRING+sourceInputStyle);
+ firstInput.setAttribute(HTML.ATTR_STYLE, "width: " + calculateWithForDiv(this.sourceWidth, 17) + VpeStyleUtil.SEMICOLON_STRING
+ + sourceInputStyle);
String value = null;
if (ComponentUtil.isNotBlank(this.sourceDefaultLabel)) {
value = this.sourceDefaultLabel;
@@ -201,10 +239,10 @@
forthEmptyDiv.appendChild(visualDocument.createTextNode("Struts"));
rootDiv.appendChild(secondDiv);
-
+
secondDiv.appendChild(thirdDiv);
- if(isToggle){
- secondDiv.appendChild(createToogleDiv(pageContext,source,visualDocument));
+ if (isToggle) {
+ secondDiv.appendChild(createToogleDiv(pageContext, source, visualDocument));
}
thirdDiv.appendChild(firstInput);
thirdDiv.appendChild(secondInput);
@@ -212,127 +250,138 @@
thirdDiv.appendChild(forthEmptyDiv);
final VpeCreationData creationData = new VpeCreationData(rootDiv);
-// final DOMTreeDumper dumper = new DOMTreeDumper();
-// dumper.dumpToStream(System.err, rootDiv);
-
+ final DOMTreeDumper dumper = new DOMTreeDumper();
+ dumper.dumpToStream(System.err, rootDiv);
+
return creationData;
}
+ /**
+ * Creates the toogle div.
+ *
+ * @param visualDocument the visual document
+ * @param pageContext the page context
+ * @param source the source
+ *
+ * @return the ns IDOM node
+ */
private nsIDOMNode createToogleDiv(VpePageContext pageContext, Element source, nsIDOMDocument visualDocument) {
final nsIDOMElement thirdEmptyDiv = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_DIV);
-
- thirdEmptyDiv.setAttribute(HTML.ATTR_STYLE,
- this.sourceListStyle+VpeStyleUtil.SEMICOLON_STRING+" z-index: 3; position: absolute; visibility: visible; top: 16px; left: 0px;");
- thirdEmptyDiv.setAttribute(HTML.ATTR_CLASS, styleClasess.get("thirdEmptyDiv")+" "+this.sourceListClass);
+
+ thirdEmptyDiv.setAttribute(HTML.ATTR_STYLE, this.sourceListStyle + VpeStyleUtil.SEMICOLON_STRING
+ + " z-index: 3; position: absolute; visibility: visible; top: 16px; left: 0px;");
+ thirdEmptyDiv.setAttribute(HTML.ATTR_CLASS, styleClasess.get("thirdEmptyDiv") + " " + this.sourceListClass);
thirdEmptyDiv.setAttribute(HTML.ATTR_STYLE, "z-index: 3; position: absolute; visibility: visible; top: 16px; left: 0px;");
-
+
final nsIDOMElement shadovDiv = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_DIV);
-
+
final nsIDOMElement positionDiv = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_DIV);
-
- positionDiv.setAttribute(HTML.ATTR_CLASS,"rich-combobox-list-position");
-
- final nsIDOMElement decorationDiv= visualDocument.createElement(HtmlComponentUtil.HTML_TAG_DIV);
-
+
+ positionDiv.setAttribute(HTML.ATTR_CLASS, "rich-combobox-list-position");
+
+ final nsIDOMElement decorationDiv = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_DIV);
+
decorationDiv.setAttribute(HTML.ATTR_CLASS, "rich-combobox-list-decoration");
-// decorationDiv.setAttribute(HTML.ATTR_STYLE, "height: 54px; width: 208px;");
-
- final nsIDOMElement scrollDiv= visualDocument.createElement(HtmlComponentUtil.HTML_TAG_DIV);
+ // decorationDiv.setAttribute(HTML.ATTR_STYLE,
+ // "height: 54px; width: 208px;");
+
+ final nsIDOMElement scrollDiv = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_DIV);
scrollDiv.setAttribute(HTML.ATTR_CLASS, "rich-combobox-list-scroll");
- scrollDiv.setAttribute(HTML.ATTR_STYLE, "height: 54px; width: "+calculateWithForDiv(sourceWidth, 2));
-
+ scrollDiv.setAttribute(HTML.ATTR_STYLE, "height: 54px; width: " + calculateWithForDiv(sourceListWidth, 2));
+
final List<Element> selectItems = ComponentUtil.getSelectItems(source.getChildNodes());
-
- if(selectItems.size() > 0){
- for(Element e:selectItems){
- scrollDiv.appendChild(createSelectItem(e,visualDocument));
+
+ if (selectItems.size() > 0) {
+ for (Element e : selectItems) {
+ scrollDiv.appendChild(createSelectItem(e, visualDocument));
}
}
shadovDiv.setAttribute(HTML.ATTR_CLASS, "rich-combobox-shadow");
-
+
final nsIDOMElement table = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_TABLE);
table.setAttribute(HTML.ATTR_CELLPADDING, "0");
table.setAttribute(HTML.ATTR_CELLSPACING, "0");
table.setAttribute(HTML.ATTR_BORDER, "0");
String width = "";
try {
- int w = ComponentUtil.parseWidthHeightValue(sourceWidth);
- w+=7;
+
+ int w = ComponentUtil.parseWidthHeightValue(sourceListWidth);
+ w += 7;
width = String.valueOf(w);
} catch (ParseException e) {
- width="217";
+ width = "217";
}
- table.setAttribute(HTML.ATTR_STYLE, "width: "+width+"px ; height: 63px;");
-
-
+ table.setAttribute(HTML.ATTR_STYLE, "width: " + width + "px ; height: 63px;");
+
final nsIDOMElement tr1 = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_TR);
final nsIDOMElement tr2 = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_TR);
-
+
final nsIDOMElement tr1_td1 = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_TD);
final nsIDOMElement tr1_td2 = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_TD);
-
+
final nsIDOMElement tr2_td1 = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_TD);
final nsIDOMElement tr2_td2 = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_TD);
-
+
final nsIDOMElement tr1_td1_img = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_IMG);
final nsIDOMElement tr1_td2_img = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_IMG);
-
-
+
final nsIDOMElement tr2_td1_img = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_IMG);
final nsIDOMElement tr2_td2_img = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_IMG);
-
-
+
tr1_td1.setAttribute(HTML.ATTR_CLASS, "rich-combobox-shadow-tl");
tr1_td2.setAttribute(HTML.ATTR_CLASS, "rich-combobox-shadow-tr");
-
-
-
+
tr2_td1.setAttribute(HTML.ATTR_CLASS, "rich-combobox-shadow-bl");
tr2_td2.setAttribute(HTML.ATTR_CLASS, "rich-combobox-shadow-br");
-
- setUpImg(tr1_td1_img, 10, 1, 0,"comboBox/spacer.gif");
- setUpImg(tr1_td2_img, 1, 10, 0,"comboBox/spacer.gif");
- setUpImg(tr2_td1_img, 1, 10, 0,"comboBox/spacer.gif");
- setUpImg(tr2_td2_img, 10, 1, 0,"comboBox/spacer.gif");
-
+ setUpImg(tr1_td1_img, 10, 1, 0, "comboBox/spacer.gif");
+ setUpImg(tr1_td2_img, 1, 10, 0, "comboBox/spacer.gif");
+ setUpImg(tr2_td1_img, 1, 10, 0, "comboBox/spacer.gif");
+ setUpImg(tr2_td2_img, 10, 1, 0, "comboBox/spacer.gif");
+
thirdEmptyDiv.appendChild(shadovDiv);
shadovDiv.appendChild(table);
thirdEmptyDiv.appendChild(positionDiv);
positionDiv.appendChild(decorationDiv);
decorationDiv.appendChild(scrollDiv);
-
+
table.appendChild(tr1);
table.appendChild(tr2);
tr1.appendChild(tr1_td1);
tr1.appendChild(tr1_td2);
-
+
tr2.appendChild(tr2_td1);
tr2.appendChild(tr2_td2);
-
+
tr1_td1.appendChild(tr1_td1_img);
tr1_td1.appendChild(visualDocument.createElement(HtmlComponentUtil.HTML_TAG_BR));
-
+
tr1_td2.appendChild(tr1_td2_img);
tr1_td2.appendChild(visualDocument.createElement(HtmlComponentUtil.HTML_TAG_BR));
-
-
+
tr2_td1.appendChild(tr2_td1_img);
tr2_td1.appendChild(visualDocument.createElement(HtmlComponentUtil.HTML_TAG_BR));
-
+
tr2_td2.appendChild(tr2_td2_img);
tr2_td2.appendChild(visualDocument.createElement(HtmlComponentUtil.HTML_TAG_BR));
-
return thirdEmptyDiv;
}
- private nsIDOMNode createSelectItem(Element e,nsIDOMDocument visualDocument) {
+ /**
+ * Creates the select item.
+ *
+ * @param visualDocument the visual document
+ * @param e the e
+ *
+ * @return the ns IDOM node
+ */
+ private nsIDOMNode createSelectItem(Element e, nsIDOMDocument visualDocument) {
final nsIDOMElement item = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_SPAN);
-
- item.setAttribute(HTML.ATTR_CLASS, "rich-combobox-item "+sourceItemClass);
+
+ item.setAttribute(HTML.ATTR_CLASS, "rich-combobox-item " + sourceItemClass);
item.appendChild(visualDocument.createTextNode(ComponentUtil.getSelectItemValue(e)));
return item;
}
@@ -340,10 +389,8 @@
/**
* Creates the button table.
*
- * @param visualDocument
- * the visual document
- * @param sourceNode
- * the source node
+ * @param visualDocument the visual document
+ * @param sourceNode the source node
*
* @return the ns IDOM element
*/
@@ -375,14 +422,10 @@
/**
* Create a HTML-part containg input element.
*
- * @param sourceElement
- * the source element
- * @param visualDocument
- * The current node of the source tree.
- * @param sourceNode
- * The document of the visual tree.
- * @param elementData
- * the element data
+ * @param sourceElement the source element
+ * @param visualDocument The current node of the source tree.
+ * @param sourceNode The document of the visual tree.
+ * @param elementData the element data
*
* @return a HTML-part containg input element
*/
@@ -428,10 +471,8 @@
/**
* Return a input class.
*
- * @param sourceElement
- * the source element
- * @param sourceNode
- * a sourceNode
+ * @param sourceElement the source element
+ * @param sourceNode a sourceNode
*
* @return a input class
*/
@@ -448,10 +489,8 @@
/**
* Return a input size.
*
- * @param sourceElement
- * the source element
- * @param sourceNode
- * a sourceNode
+ * @param sourceElement the source element
+ * @param sourceNode a sourceNode
*
* @return a input size
*/
@@ -467,10 +506,8 @@
/**
* Return a input style.
*
- * @param sourceElement
- * the source element
- * @param sourceNode
- * a sourceNode
+ * @param sourceElement the source element
+ * @param sourceNode a sourceNode
*
* @return a input style
*/
@@ -482,10 +519,8 @@
/**
* Return a input value.
*
- * @param sourceElement
- * the source element
- * @param sourceNode
- * a sourceNode
+ * @param sourceElement the source element
+ * @param sourceNode a sourceNode
*
* @return a input value
*/
@@ -499,6 +534,9 @@
return returnValue;
}
+ /**
+ * Inits the default classes.
+ */
private void initDefaultClasses() {
styleClasess.put("secondDiv", "rich-combobox-font rich-combobox");
styleClasess.put("thirdDiv", "rich-combobox-font rich-combobox-shell");
@@ -509,6 +547,19 @@
styleClasess.put("forthEmptyDiv", "rich-combobox-strut rich-combobox-font");
}
+ /**
+ * Checks if is recreate at attr change.
+ *
+ * @param sourceElement the source element
+ * @param value the value
+ * @param visualDocument the visual document
+ * @param visualNode the visual node
+ * @param data the data
+ * @param pageContext the page context
+ * @param name the name
+ *
+ * @return true, if is recreate at attr change
+ */
@Override
public boolean isRecreateAtAttrChange(VpePageContext pageContext, Element sourceElement, nsIDOMDocument visualDocument,
nsIDOMElement visualNode, Object data, String name, String value) {
@@ -517,7 +568,9 @@
}
/**
- * @param source
+ * Prepare data.
+ *
+ * @param source the source
*/
private void prepareData(Element source) {
this.sourceAlign = source.getAttribute("align");
@@ -536,48 +589,41 @@
this.sourceWidth = DEFAULT_LIST_WIDTH;
}
- this.sourceDefaultLabel = ComponentUtil.getAttribute(source,"defaultLabel");
- this.sourceValue = ComponentUtil.getAttribute(source,"value");
+ this.sourceDefaultLabel = ComponentUtil.getAttribute(source, "defaultLabel");
+ this.sourceValue = ComponentUtil.getAttribute(source, "value");
- this.sourceButtonStyle = ComponentUtil.getAttribute(source,"buttonStyle");
+ this.sourceButtonStyle = ComponentUtil.getAttribute(source, "buttonStyle");
- final String sourceStyleClasess = ComponentUtil.getAttribute(source,RichFaces.ATTR_STYLE_CLASS);
+ final String sourceStyleClasess = ComponentUtil.getAttribute(source, RichFaces.ATTR_STYLE_CLASS);
if (ComponentUtil.isNotBlank(sourceStyleClasess)) {
styleClasess.put("secondDiv", styleClasess.get("secondDiv") + " " + sourceStyleClasess);
}
-
- this.sourceStyle = ComponentUtil.getAttribute(source,HTML.ATTR_STYLE);
- this.sourceInputStyle = ComponentUtil.getAttribute(source,"inputStyle");
- this.sourceInputClass = ComponentUtil.getAttribute(source,"inputClass");
- this.sourceListClass = ComponentUtil.getAttribute(source,"listClass");
- this.sourceListStyle = ComponentUtil.getAttribute(source,"listStyle");
- this.sourceItemClass = ComponentUtil.getAttribute(source,"itemClass");
+ this.sourceStyle = ComponentUtil.getAttribute(source, HTML.ATTR_STYLE);
+ this.sourceInputStyle = ComponentUtil.getAttribute(source, "inputStyle");
+ this.sourceInputClass = ComponentUtil.getAttribute(source, "inputClass");
+ this.sourceListClass = ComponentUtil.getAttribute(source, "listClass");
+ this.sourceListStyle = ComponentUtil.getAttribute(source, "listStyle");
+ this.sourceItemClass = ComponentUtil.getAttribute(source, "itemClass");
+
}
/**
* Sets the attribute.
*
- * @param sourceElement
- * the source element
- * @param visualDocument
- * the visual document
- * @param value
- * the value
- * @param visualNode
- * the visual node
- * @param data
- * the data
- * @param pageContext
- * the page context
- * @param name
- * the name
+ * @param sourceElement the source element
+ * @param value the value
+ * @param visualDocument the visual document
+ * @param visualNode the visual node
+ * @param data the data
+ * @param pageContext the page context
+ * @param name the name
*
* @see com.exadel.vpe.editor.template.VpeAbstractTemplate#setAttribute(com.
- * exadel.vpe.editor.context.VpePageContext, org.w3c.dom.Element,
- * org.w3c.dom.Document, org.w3c.dom.Node, java.lang.Object,
- * java.lang.String, java.lang.String)
+ * exadel.vpe.editor.context.VpePageContext, org.w3c.dom.Element,
+ * org.w3c.dom.Document, org.w3c.dom.Node, java.lang.Object,
+ * java.lang.String, java.lang.String)
*/
@Override
public void setAttribute(VpePageContext pageContext, Element sourceElement, nsIDOMDocument visualDocument, nsIDOMNode visualNode,
@@ -615,17 +661,17 @@
// table.setAttribute(HTML.ATTR_STYLE, strStyle);
}
-
-
/**
* Sets the up img.
*
- * @param i * @param width the width
+ * @param i *
+ * @param width the width
* @param height the height
* @param img the img
+ * @param j *
* @param image the image
- * @param j * @param border the border
+ * @param border the border
* @param td1Img */
protected void setUpImg(nsIDOMElement img, int width, int height, int border, String image) {
ComponentUtil.setImg(img, image);
@@ -635,12 +681,10 @@
}
-
/**
* Sets the up table.
*
- * @param table
- * the table
+ * @param table the table
*/
private void setUpTable(final nsIDOMElement table) {
table.setAttribute(HTML.ATTR_BORDER, ZERO_STRING);
@@ -651,14 +695,10 @@
/**
* Sets the up td.
*
- * @param visualDocument
- * the visual document
- * @param elementData
- * the element data
- * @param cellInput
- * the cell input
- * @param source
- * the source
+ * @param visualDocument the visual document
+ * @param elementData the element data
+ * @param cellInput the cell input
+ * @param source the source
*/
private void setUpTd(nsIDOMDocument visualDocument, final Element source, final VpeElementData elementData,
final nsIDOMElement cellInput) {
@@ -667,14 +707,26 @@
cellInput.appendChild(createInputElement(visualDocument, source, elementData));
}
+ /**
+ * Stop toggling.
+ *
+ * @param sourceNode the source node
+ */
public void stopToggling(Node sourceNode) {
isToggle = false;
-
+
}
+ /**
+ * Toggle.
+ *
+ * @param builder the builder
+ * @param sourceNode the source node
+ * @param toggleId the toggle id
+ */
public void toggle(VpeVisualDomBuilder builder, Node sourceNode, String toggleId) {
isToggle = !isToggle;
-
+
}
}
15 years, 9 months
- 1
- 0
JBoss Tools SVN: r9082 - in trunk: as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers and 16 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-07-07 20:15:46 -0400 (Mon, 07 Jul 2008)
New Revision: 9082
Added:
trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE1406/
trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE1406/.classpath
trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE1406/.packages
trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE1406/.project
trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE1406/bin/
trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE1406/output/
trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE1406/src/
trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE1406/src/in.properties
trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/model/StringSubstitutionTest.java
trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/projects/JBIDE1406Test.java
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/archives/J2EEArchiveType.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/archives/WarArchiveType.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/FilesetViewProvider.java
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/META-INF/MANIFEST.MF
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/model/other/internal/WorkspaceVFS.java
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/model/types/WorkspaceJARArchiveType.java
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ant/AntVariables.java
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/DirectoryScannerFactory.java
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IArchiveFileSet.java
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IArchiveNode.java
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IArchivesVFS.java
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IVariableManager.java
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/ArchiveFileSetImpl.java
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/ArchiveImpl.java
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/ArchiveNodeImpl.java
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/xpl/StringSubstitutionEngineClone.java
trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers/ArchivesLabelProvider.java
trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/FilesetWizard.java
trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages/FilesetInfoWizardPage.java
trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/ArchivesTestSuite.java
trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/model/ModelTest.java
trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/model/ModelUtilTest.java
trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/projects/JBIDE2099Test.java
trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/projects/JBIDE2311Test.java
trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/projects/JBIDE2315Test.java
trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/projects/JBIDE2439Test.java
Log:
JBIDE-1406 core with unit test
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/archives/J2EEArchiveType.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/archives/J2EEArchiveType.java 2008-07-07 15:46:34 UTC (rev 9081)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/archives/J2EEArchiveType.java 2008-07-08 00:15:46 UTC (rev 9082)
@@ -142,7 +142,7 @@
sourceContainer = project;
}
- fs.setSourcePath(sourceContainer.getFullPath());
+ fs.setRawSourcePath(sourceContainer.getFullPath().toString());
fs.setInWorkspace(true);
fs.setIncludesPattern( includePattern == null ? "**/*" : includePattern );
parent.addChild(fs);
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/archives/WarArchiveType.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/archives/WarArchiveType.java 2008-07-07 15:46:34 UTC (rev 9081)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/archives/WarArchiveType.java 2008-07-08 00:15:46 UTC (rev 9082)
@@ -101,7 +101,7 @@
try {
IPath projectPath = project.getLocation();
DirectoryScanner scanner =
- DirectoryScannerFactory.createDirectoryScanner(projectPath, "**/WEB-INF/web.xml", null, true);
+ DirectoryScannerFactory.createDirectoryScanner(projectPath.toString(), "**/WEB-INF/web.xml", null, true);
String[] files = scanner.getIncludedFiles();
// just take the first
if( files.length > 0 ) {
@@ -134,7 +134,7 @@
try {
IPath projectPath = project.getLocation();
DirectoryScanner scanner =
- DirectoryScannerFactory.createDirectoryScanner(projectPath, "**/web.xml", null, true);
+ DirectoryScannerFactory.createDirectoryScanner(projectPath.toString(), "**/web.xml", null, true);
String[] files = scanner.getIncludedFiles();
// just take the first
if( files.length > 0 ) {
@@ -156,7 +156,7 @@
IPath projectPath = project.getLocation();
DirectoryScanner scanner =
- DirectoryScannerFactory.createDirectoryScanner(projectPath, "**/WEB-INF/web.xml", null, true);
+ DirectoryScannerFactory.createDirectoryScanner(projectPath.toString(), "**/WEB-INF/web.xml", null, true);
String[] files = scanner.getIncludedFiles();
if(files != null && files.length > 0) {
@@ -168,7 +168,7 @@
//having failed to find 'lib' directory, let us make source of the project itself
sourcePath = project.getName();
DirectoryScanner scanner2 =
- DirectoryScannerFactory.createDirectoryScanner(projectPath, "**/*.jar", null, true);
+ DirectoryScannerFactory.createDirectoryScanner(projectPath.toString(), "**/*.jar", null, true);
String[] files2 = scanner2.getIncludedFiles();
IPath p;
ArrayList list = new ArrayList();
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/FilesetViewProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/FilesetViewProvider.java 2008-07-07 15:46:34 UTC (rev 9081)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/FilesetViewProvider.java 2008-07-08 00:15:46 UTC (rev 9082)
@@ -595,7 +595,7 @@
try {
if( dir != null ) {
DirectoryScanner scanner =
- DirectoryScannerFactory.createDirectoryScanner(new Path(dir), includes, excludes, true);
+ DirectoryScannerFactory.createDirectoryScanner(dir, includes, excludes, true);
if( scanner != null ) {
String[] files = scanner.getIncludedFiles();
paths = new IPath[files.length];
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/META-INF/MANIFEST.MF 2008-07-07 15:46:34 UTC (rev 9081)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/META-INF/MANIFEST.MF 2008-07-08 00:15:46 UTC (rev 9082)
@@ -31,5 +31,9 @@
org.jboss.ide.eclipse.archives.core.model,
org.jboss.ide.eclipse.archives.core.model.internal;x-friends:="org.jboss.ide.eclipse.archives.test",
org.jboss.ide.eclipse.archives.core.model.internal.xb;x-friends:="org.jboss.ide.eclipse.archives.test",
+ org.jboss.ide.eclipse.archives.core.model.other.internal,
+ org.jboss.ide.eclipse.archives.core.model.types,
+ org.jboss.ide.eclipse.archives.core.project,
org.jboss.ide.eclipse.archives.core.util;x-friends:="org.jboss.ide.eclipse.archives.test",
- org.jboss.ide.eclipse.archives.core.util.internal;x-friends:="org.jboss.ide.eclipse.archives.test"
+ org.jboss.ide.eclipse.archives.core.util.internal;x-friends:="org.jboss.ide.eclipse.archives.test",
+ org.jboss.ide.eclipse.archives.core.xpl
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/model/other/internal/WorkspaceVFS.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/model/other/internal/WorkspaceVFS.java 2008-07-07 15:46:34 UTC (rev 9081)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/model/other/internal/WorkspaceVFS.java 2008-07-08 00:15:46 UTC (rev 9082)
@@ -1,21 +1,79 @@
package org.jboss.ide.eclipse.archives.core.model.other.internal;
import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
-import org.eclipse.core.variables.VariablesPlugin;
+import org.eclipse.core.runtime.preferences.DefaultScope;
+import org.eclipse.core.runtime.preferences.IEclipsePreferences;
+import org.jboss.ide.eclipse.archives.core.ArchivesCorePlugin;
import org.jboss.ide.eclipse.archives.core.model.IArchivesVFS;
+import org.jboss.ide.eclipse.archives.core.model.IVariableManager;
+import org.jboss.ide.eclipse.archives.core.xpl.StringSubstitutionEngineClone;
public class WorkspaceVFS implements IArchivesVFS {
+ protected WorkspaceVariableManager manager;
+ protected StringSubstitutionEngineClone engine;
+ public WorkspaceVFS() {
+ manager = new WorkspaceVariableManager();
+ engine = new StringSubstitutionEngineClone();
+ }
+
+ public WorkspaceVariableManager getManager() {
+ return manager;
+ }
+
+ public class WorkspaceVariableManager implements IVariableManager {
+ private static final String PREFIX = "org.jboss.ide.eclipse.archives.core.model.other.internal.WorkspaceVariableManager.";
+ public boolean containsVariable(String variable) {
+ IEclipsePreferences prefs = new DefaultScope().getNode(ArchivesCorePlugin.PLUGIN_ID);
+ return prefs.get(PREFIX + variable, null) != null;
+ }
+ public String getVariableValue(String variable) {
+ IEclipsePreferences prefs = new DefaultScope().getNode(ArchivesCorePlugin.PLUGIN_ID);
+ return prefs.get(PREFIX + variable, null);
+ }
+
+
+ public void setValue(String name, IPath value) throws CoreException {
+ try {
+ IEclipsePreferences prefs = new DefaultScope().getNode(ArchivesCorePlugin.PLUGIN_ID);
+ if( value != null )
+ prefs.put(PREFIX + name, value.toString());
+ else
+ prefs.remove(PREFIX + name);
+ prefs.flush();
+ } catch (org.osgi.service.prefs.BackingStoreException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+
public String performStringSubstitution(String expression,
boolean reportUndefinedVariables) throws CoreException {
- return VariablesPlugin.getDefault().getStringVariableManager().performStringSubstitution(expression, reportUndefinedVariables);
+ return performStringSubstitution(expression, null, reportUndefinedVariables);
}
+ public String performStringSubstitution(String expression,
+ String projectName, boolean reportUndefinedVariables)
+ throws CoreException {
+ // set this project name
+ if( projectName != null ) {
+ manager.setValue("current.project", new Path(projectName));
+ }
+
+ String ret = engine.performStringSubstitution(expression, reportUndefinedVariables, manager);
+
+ if( projectName != null ) {
+ manager.setValue("current.project", null);
+ }
+ return ret;
+ }
+
public IPath[] getWorkspaceChildren(IPath path) {
IResource res = ResourcesPlugin.getWorkspace().getRoot().findMember(path);
if( res != null || !(res instanceof IContainer)) {
@@ -51,4 +109,12 @@
results[i] = workspacePathToAbsolutePath(paths[i]);
return results;
}
+
+ public String findProject(IPath absolutePath) {
+ IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
+ for( int i = 0; i < projects.length; i++ )
+ if( projects[i].getLocation().equals(absolutePath))
+ return projects[i].getName();
+ return null;
+ }
}
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/model/types/WorkspaceJARArchiveType.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/model/types/WorkspaceJARArchiveType.java 2008-07-07 15:46:34 UTC (rev 9081)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/model/types/WorkspaceJARArchiveType.java 2008-07-08 00:15:46 UTC (rev 9082)
@@ -60,7 +60,7 @@
IArchiveFileSet classes = new ArchiveFileSetImpl();
classes.setIncludesPattern("**/*");
- classes.setSourcePath(outputContainer.getFullPath());
+ classes.setRawSourcePath(outputContainer.getFullPath().toString());
classes.setInWorkspace(true);
try {
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ant/AntVariables.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ant/AntVariables.java 2008-07-07 15:46:34 UTC (rev 9081)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ant/AntVariables.java 2008-07-08 00:15:46 UTC (rev 9082)
@@ -16,6 +16,12 @@
boolean reportUndefinedVariables) throws CoreException {
return new StringSubstitutionEngineClone().performStringSubstitution(expression, reportUndefinedVariables, this);
}
+ public String performStringSubstitution(String expression,
+ String projectName, boolean reportUndefinedVariables)
+ throws CoreException {
+ // TODO Auto-generated method stub
+ return null;
+ }
public boolean containsVariable(String variable) {
return false;
@@ -36,5 +42,13 @@
// TODO Auto-generated method stub
return null;
}
+ public String getVariableValue(String variable) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+ public String findProject(IPath absolutePath) {
+ // TODO Auto-generated method stub
+ return null;
+ }
}
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/DirectoryScannerFactory.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/DirectoryScannerFactory.java 2008-07-07 15:46:34 UTC (rev 9081)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/DirectoryScannerFactory.java 2008-07-08 00:15:46 UTC (rev 9082)
@@ -25,6 +25,7 @@
import java.util.ArrayList;
import java.util.HashMap;
+import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
import org.jboss.ide.eclipse.archives.core.ArchivesCore;
@@ -36,30 +37,32 @@
*/
public class DirectoryScannerFactory {
private static class ScannableFileSet {
- public IPath rawPath;
+ public String rawPath;
public IPath rootArchiveRelativePath;
public String includes;
public String excludes;
public boolean inWorkspace;
+ public String projectName;
};
public static DirectoryScannerExtension createDirectoryScanner(IArchiveFileSet fs, boolean scan) {
- return createDirectoryScanner(fs.getSourcePath(), fs.getRootArchiveRelativePath(), fs.getIncludesPattern(), fs.getExcludesPattern(), fs.isInWorkspace(), scan);
+ return createDirectoryScanner(fs.getRawSourcePath(), fs.getRootArchiveRelativePath(), fs.getIncludesPattern(), fs.getExcludesPattern(), fs.getProjectName(), fs.isInWorkspace(), scan);
}
// THIS SHOULD NOT BE USED ;) just here for now
// eradicate all uses!
- public static DirectoryScannerExtension createDirectoryScanner (IPath rawPath, String includes, String excludes, boolean scan) {
- return createDirectoryScanner(rawPath, null, includes, excludes, false, scan);
+ public static DirectoryScannerExtension createDirectoryScanner (String rawPath, String includes, String excludes, boolean scan) {
+ return createDirectoryScanner(rawPath, null, includes, excludes, null, false, scan);
}
- public static DirectoryScannerExtension createDirectoryScanner (IPath rawPath, IPath rootArchiveRelativePath, String includes, String excludes, boolean inWorkspace, boolean scan) {
+ public static DirectoryScannerExtension createDirectoryScanner (String rawPath, IPath rootArchiveRelativePath, String includes, String excludes, String projectName, boolean inWorkspace, boolean scan) {
ScannableFileSet fs = new ScannableFileSet();
fs.rawPath = rawPath;
fs.rootArchiveRelativePath = rootArchiveRelativePath;
fs.includes = includes;
fs.excludes = excludes;
fs.inWorkspace = inWorkspace;
+ fs.projectName = projectName;
DirectoryScannerExtension scanner = new DirectoryScannerExtension(fs);
if (scan) {
scanner.scan();
@@ -98,16 +101,27 @@
* setting in superclass. Ant will not understand
* variables!
*/
- public void setBasedir2(IPath path) {
- if( workspaceRelative ) {
- IPath p = ArchivesCore.getInstance().getVFS()
- .workspacePathToAbsolutePath(path);
- setBasedir(new FileWrapper(p.toFile(), path));
- } else {
- setBasedir(new FileWrapper(path.toFile(), path));
+ public void setBasedir2(String path) {
+ String translatedPath = replaceVariables(path);
+ if( translatedPath != null ) {
+ IPath translatedPath2 = new Path(translatedPath);
+ if( workspaceRelative ) {
+ IPath p = ArchivesCore.getInstance().getVFS()
+ .workspacePathToAbsolutePath(translatedPath2);
+ setBasedir(new FileWrapper(p.toFile(), translatedPath2));
+ } else {
+ setBasedir(new FileWrapper(new File(translatedPath), translatedPath2));
+ }
}
}
-
+ public String replaceVariables(String rawPath) {
+ try {
+ return ArchivesCore.getInstance().getVFS().
+ performStringSubstitution(rawPath, fs.projectName, true);
+ } catch( CoreException ce ) {
+ }
+ return null;
+ }
protected String getName(File file) {
return workspaceRelative ? ((FileWrapper)file).getOutputName() : super.getName(file);
}
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IArchiveFileSet.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IArchiveFileSet.java 2008-07-07 15:46:34 UTC (rev 9081)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IArchiveFileSet.java 2008-07-08 00:15:46 UTC (rev 9082)
@@ -60,10 +60,18 @@
public IPath getGlobalSourcePath();
/**
+ * @return the source path from the delegate with no translation at all
+ */
+ public String getRawSourcePath();
+
+ /**
+ * Return a source path that is file-system or workspace
+ * relative but has all of its variables translated already.
+ *
* @return the source path from the delegate (file-system or workspace-relative)
*/
public IPath getSourcePath();
-
+
/**
* Force the scanner to check for matched files again
*/
@@ -112,7 +120,7 @@
* Sets the "root" or "source" of this fileset (file-system or workspace relative)
* @param path The absolute path that is the source of this fileset
*/
- public void setSourcePath(IPath path);
+ public void setRawSourcePath (String raw);
/**
* Set the includes pattern for this fileset. This pattern uses the same syntax as Ant's include pattern.
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IArchiveNode.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IArchiveNode.java 2008-07-07 15:46:34 UTC (rev 9081)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IArchiveNode.java 2008-07-08 00:15:46 UTC (rev 9082)
@@ -121,6 +121,11 @@
public IPath getProjectPath();
/**
+ * @return the name of the project this node is defined in
+ */
+ public String getProjectName();
+
+ /**
* Recursively visit the package node tree below this node with the passed-in package node visitor.
* @param visitor A package node visitor
* @return Whether or not the entire sub-tree was visited
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IArchivesVFS.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IArchivesVFS.java 2008-07-07 15:46:34 UTC (rev 9081)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IArchivesVFS.java 2008-07-08 00:15:46 UTC (rev 9082)
@@ -45,9 +45,8 @@
* @return
*/
public IPath workspacePathToAbsolutePath(IPath path);
-
public IPath[] workspacePathToAbsolutePath(IPath[] paths);
-
+ public String findProject(IPath absolutePath);
public String performStringSubstitution(String expression, boolean reportUndefinedVariables) throws CoreException;
-
+ public String performStringSubstitution(String expression, String projectName, boolean reportUndefinedVariables) throws CoreException;
}
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IVariableManager.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IVariableManager.java 2008-07-07 15:46:34 UTC (rev 9081)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IVariableManager.java 2008-07-08 00:15:46 UTC (rev 9082)
@@ -27,5 +27,5 @@
*/
public interface IVariableManager {
public boolean containsVariable(String variable);
- public String getVariableValue(String variable, String arg);
+ public String getVariableValue(String variable);
}
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/ArchiveFileSetImpl.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/ArchiveFileSetImpl.java 2008-07-07 15:46:34 UTC (rev 9081)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/ArchiveFileSetImpl.java 2008-07-08 00:15:46 UTC (rev 9082)
@@ -25,6 +25,7 @@
import java.util.HashMap;
import org.eclipse.core.runtime.Assert;
+import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
@@ -94,11 +95,25 @@
}
/*
+ * (non-Javadoc)
+ * @see org.jboss.ide.eclipse.archives.core.model.IArchiveFileSet#getRawSourcePath()
+ */
+ public String getRawSourcePath() {
+ return getFileSetDelegate().getDir();
+ }
+
+ /*
* @see IArchiveFileSet#getSourcePath()
*/
public IPath getSourcePath() {
- return getFileSetDelegate().getDir() == null ?
- null : new Path(getFileSetDelegate().getDir());
+ try {
+ String out = ArchivesCore.getInstance().getVFS().
+ performStringSubstitution(getRawSourcePath(),
+ getProjectName(), true);
+ return new Path(out);
+ } catch( CoreException ce ) {
+ }
+ return null;
}
/*
@@ -216,11 +231,13 @@
/*
* @see IArchiveFileSet#setSourcePath(IPath, boolean)
*/
- public void setSourcePath (IPath path) {
- Assert.isNotNull(path);
- IPath src = getSourcePath();
- attributeChanged(SOURCE_PATH_ATTRIBUTE, src == null ? null : src.toString(), path == null ? null : path.toString());
- getFileSetDelegate().setDir(path.toString());
+ public void setRawSourcePath (String raw) {
+ Assert.isNotNull(raw);
+ String src = getRawSourcePath();
+ attributeChanged(SOURCE_PATH_ATTRIBUTE,
+ src == null ? null : src.toString(),
+ raw == null ? null : raw);
+ getFileSetDelegate().setDir(raw);
rescanRequired = true;
}
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/ArchiveImpl.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/ArchiveImpl.java 2008-07-07 15:46:34 UTC (rev 9081)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/ArchiveImpl.java 2008-07-08 00:15:46 UTC (rev 9082)
@@ -23,6 +23,7 @@
import java.util.ArrayList;
+import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
import org.jboss.ide.eclipse.archives.core.ArchivesCore;
@@ -76,10 +77,16 @@
if( packageDelegate.getToDir().equals("."))
return getProjectPath() == null ? Path.EMPTY : getProjectPath();
- if (isDestinationInWorkspace()) {
- return ArchivesCore.getInstance().getVFS().workspacePathToAbsolutePath(new Path(packageDelegate.getToDir()));
- } else
- return new Path(packageDelegate.getToDir());
+ try {
+ String replaced = ArchivesCore.getInstance().getVFS().
+ performStringSubstitution(packageDelegate.getToDir(), getProjectName(), true);
+ if (isDestinationInWorkspace()) {
+ return ArchivesCore.getInstance().getVFS().workspacePathToAbsolutePath(new Path(replaced));
+ } else {
+ return new Path(replaced);
+ }
+ } catch( CoreException ce ) {}
+ return null;
}
public IPath getDestinationPath() {
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/ArchiveNodeImpl.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/ArchiveNodeImpl.java 2008-07-07 15:46:34 UTC (rev 9081)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/ArchiveNodeImpl.java 2008-07-08 00:15:46 UTC (rev 9082)
@@ -28,6 +28,7 @@
import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.IPath;
+import org.jboss.ide.eclipse.archives.core.ArchivesCore;
import org.jboss.ide.eclipse.archives.core.model.ArchivesModelException;
import org.jboss.ide.eclipse.archives.core.model.IArchive;
import org.jboss.ide.eclipse.archives.core.model.IArchiveModelRootNode;
@@ -177,6 +178,15 @@
/*
* (non-Javadoc)
+ * @see org.jboss.ide.eclipse.archives.core.model.IArchiveNode#getProjectName()
+ */
+ public String getProjectName() {
+ IPath path = getProjectPath();
+ return ArchivesCore.getInstance().getVFS().findProject(path);
+ }
+
+ /*
+ * (non-Javadoc)
* @see org.jboss.ide.eclipse.archives.core.model.IArchiveNode#getProperty(java.lang.String)
*/
public String getProperty(String property) {
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/xpl/StringSubstitutionEngineClone.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/xpl/StringSubstitutionEngineClone.java 2008-07-07 15:46:34 UTC (rev 9081)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/xpl/StringSubstitutionEngineClone.java 2008-07-08 00:15:46 UTC (rev 9082)
@@ -30,7 +30,7 @@
// delimiters
private static final String VARIABLE_START = "${"; //$NON-NLS-1$
private static final char VARIABLE_END = '}';
- private static final char VARIABLE_ARG = ':';
+// private static final char VARIABLE_ARG = ':';
// parsing states
private static final int SCAN_FOR_START = 0;
private static final int SCAN_FOR_END = 1;
@@ -236,25 +236,26 @@
*/
private String resolve(VariableReference var, boolean reportUndefinedVariables, IVariableManager manager) throws CoreException {
String text = var.getText();
- int pos = text.indexOf(VARIABLE_ARG);
String name = null;
- String arg = null;
- if (pos > 0) {
- name = text.substring(0, pos);
- pos++;
- if (pos < text.length()) {
- arg = text.substring(pos);
- }
- } else {
- name = text;
- }
+// int pos = text.indexOf(VARIABLE_ARG);
+// String arg = null;
+// if (pos > 0) {
+// name = text.substring(0, pos);
+// pos++;
+// if (pos < text.length()) {
+// arg = text.substring(pos);
+// }
+// } else {
+// name = text;
+// }
+ name = text;
if( !manager.containsVariable(name)) {
if( reportUndefinedVariables )
throw new CoreException(new Status(IStatus.ERROR, ArchivesCore.PLUGIN_ID, "Variable " + name + " undefined"));
return getOriginalVarText(var);
}
- String ret = manager.getVariableValue(name, arg);
+ String ret = manager.getVariableValue(name);
if(ret == null)
return getOriginalVarText(var);
return ret;
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers/ArchivesLabelProvider.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers/ArchivesLabelProvider.java 2008-07-07 15:46:34 UTC (rev 9081)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers/ArchivesLabelProvider.java 2008-07-08 00:15:46 UTC (rev 9082)
@@ -116,7 +116,7 @@
if (showFullPath) {
text += fileset.getGlobalSourcePath().toString();
} else if( inWorkspace ){
- text += fileset.getSourcePath().toString();
+ text += fileset.getRawSourcePath();
} else {
text += fileset.getGlobalSourcePath().lastSegment();
}
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/FilesetWizard.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/FilesetWizard.java 2008-07-07 15:46:34 UTC (rev 9081)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/FilesetWizard.java 2008-07-08 00:15:46 UTC (rev 9082)
@@ -34,39 +34,39 @@
if (createFileset)
this.fileset = ArchiveNodeFactory.createFileset();
-
- fillFilesetFromPage(fileset);
- try {
- getContainer().run(true, false, new IRunnableWithProgress () {
- public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
- if (createFileset)
- parentNode.addChild(fileset);
- try {
- ArchivesModel.instance().save(fileset.getProjectPath(), monitor);
- } catch( ArchivesModelException ame ) {
- IStatus status = new Status(IStatus.ERROR, PackagesUIPlugin.PLUGIN_ID, "Error Completing Wizard", ame);
- PackagesUIPlugin.getDefault().getLog().log(status);
- }
- }
- });
- } catch (InvocationTargetException e) {
- } catch (InterruptedException e) {
- } catch(Exception e) {e.printStackTrace();}
return true;
+// fillFilesetFromPage(fileset);
+// try {
+// getContainer().run(true, false, new IRunnableWithProgress () {
+// public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
+// if (createFileset)
+// parentNode.addChild(fileset);
+// try {
+// ArchivesModel.instance().save(fileset.getProjectPath(), monitor);
+// } catch( ArchivesModelException ame ) {
+// IStatus status = new Status(IStatus.ERROR, PackagesUIPlugin.PLUGIN_ID, "Error Completing Wizard", ame);
+// PackagesUIPlugin.getDefault().getLog().log(status);
+// }
+// }
+// });
+// } catch (InvocationTargetException e) {
+// } catch (InterruptedException e) {
+// } catch(Exception e) {e.printStackTrace();}
+// return true;
+// }
+//
+// private void fillFilesetFromPage (IArchiveFileSet fileset) {
+// fileset.setExcludesPattern(page1.getExcludes());
+// fileset.setIncludesPattern(page1.getIncludes());
+// fileset.setFlattened(page1.getFlatten());
+// if( page1.isRootDirWorkspaceRelative()) {
+// fileset.setSourcePath(new Path(page1.getWorkspaceRelativeRootDir()));
+// fileset.setInWorkspace(true);
+// } else {
+// fileset.setSourcePath(new Path(page1.getAbsoluteRootDir()));
+// fileset.setInWorkspace(false);
+// }
}
-
- private void fillFilesetFromPage (IArchiveFileSet fileset) {
- fileset.setExcludesPattern(page1.getExcludes());
- fileset.setIncludesPattern(page1.getIncludes());
- fileset.setFlattened(page1.getFlatten());
- if( page1.isRootDirWorkspaceRelative()) {
- fileset.setSourcePath(new Path(page1.getWorkspaceRelativeRootDir()));
- fileset.setInWorkspace(true);
- } else {
- fileset.setSourcePath(new Path(page1.getAbsoluteRootDir()));
- fileset.setInWorkspace(false);
- }
- }
public void addPages() {
page1 = new FilesetInfoWizardPage(getShell(), fileset, parentNode);
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages/FilesetInfoWizardPage.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages/FilesetInfoWizardPage.java 2008-07-07 15:46:34 UTC (rev 9081)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages/FilesetInfoWizardPage.java 2008-07-08 00:15:46 UTC (rev 9082)
@@ -2,12 +2,11 @@
import java.util.ArrayList;
-import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
@@ -21,14 +20,10 @@
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.DirectoryDialog;
import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.ContainerSelectionDialog;
-import org.eclipse.ui.ide.IDE;
import org.jboss.ide.eclipse.archives.core.ArchivesCore;
import org.jboss.ide.eclipse.archives.core.model.DirectoryScannerFactory;
import org.jboss.ide.eclipse.archives.core.model.IArchiveFileSet;
@@ -42,29 +37,28 @@
public class FilesetInfoWizardPage extends WizardPage {
- private IArchiveFileSet fileset;
private IArchiveNode parentNode;
- private Text includesText;
- private Text excludesText;
- private ArchiveNodeDestinationComposite destinationComposite;
-
- private String includes, excludes, workspaceRelativeRootDir;
+ private IArchiveFileSet fileset;
+ private String includes, excludes, rawPath;
+ private String projectName;
+ private boolean flattened;
+ private boolean workspaceRelative;
/**
* This variable must at all times be global. ALWAYS
*/
- private IPath rootDir;
- private boolean rootDirIsWorkspaceRelative;
private FilesetPreviewComposite previewComposite;
private Composite mainComposite;
private Text rootDirText;
- private Label rootProjectLabel, flattenedLabel;
+ private Label flattenedLabel;
private Button rootDirWorkspaceBrowseButton;
private Button rootDirFilesystemBrowseButton;
private Button flattenedYes;
private Button flattenedNo;
- private boolean flattened;
+ private Text includesText;
+ private Text excludesText;
+ private ArchiveNodeDestinationComposite destinationComposite;
public FilesetInfoWizardPage (Shell parent, IArchiveFileSet fileset, IArchiveNode parentNode) {
super(ArchivesUIMessages.FilesetInfoWizardPage_new_title, ArchivesUIMessages.FilesetInfoWizardPage_new_title, null);
@@ -158,20 +152,6 @@
destinationKey.setLayoutData(createFormData(0,10,null,0,null,5, 0, max));
destinationComposite.setLayoutData(createFormData(0,5,null,0,destinationKey,5, 100, -5));
-
- // root project row
- Label rootProjectKey = new Label(infoGroup, SWT.NONE);
- Composite rootProjectVal = new Composite(infoGroup, SWT.NONE);
- rootProjectVal.setLayout(new FormLayout());
- Label projectImageLabel = new Label(rootProjectVal, SWT.NONE);
- rootProjectLabel = new Label(rootProjectVal, SWT.NONE);
-
- projectImageLabel.setLayoutData(createFormData(0,0,null,0,0,0, null,0));
- rootProjectLabel.setLayoutData(createFormData(0,0,null,0,projectImageLabel, 10, 100,-5));
- rootProjectKey.setLayoutData(createFormData(destinationComposite,5,null,0,null,5,0,max));
- rootProjectVal.setLayoutData(createFormData(destinationComposite,5, null, 0, destinationKey, 5, 100, -5));
-
-
// root dir
Label rootDirectoryLabel = new Label(infoGroup, SWT.NONE);
Composite rootDirValue = new Composite(infoGroup, SWT.NONE);
@@ -185,8 +165,8 @@
rootDirFilesystemBrowseButton.setLayoutData(createFormData(rootDirText,5,null,0,null,0,100,-5));
rootDirWorkspaceBrowseButton.setLayoutData(createFormData(rootDirText,5,null,0,null,0,rootDirFilesystemBrowseButton, -5));
- rootDirectoryLabel.setLayoutData(createFormData(rootProjectVal,10,null,0,null,5,0,max));
- rootDirValue.setLayoutData(createFormData(rootProjectVal,5,null,0,rootDirectoryLabel,5,100,-5));
+ rootDirectoryLabel.setLayoutData(createFormData(destinationComposite,10,null,0,null,5,0,max));
+ rootDirValue.setLayoutData(createFormData(destinationComposite,5,null,0,rootDirectoryLabel,5,100,-5));
flattenedLabel = new Label(infoGroup, SWT.NONE);
flattenedYes = new Button(infoGroup, SWT.RADIO);
@@ -222,9 +202,6 @@
// customize widgets
destinationKey.setText(ArchivesUIMessages.FilesetInfoWizardPage_destination_label);
- rootProjectKey.setText(ArchivesUIMessages.FilesetInfoWizardPage_rootProject_label);
- projectImageLabel.setImage(
- PlatformUI.getWorkbench().getSharedImages().getImage(IDE.SharedImages.IMG_OBJ_PROJECT));
rootDirectoryLabel.setText(ArchivesUIMessages.FilesetInfoWizardPage_rootDirectory_label);
rootDirWorkspaceBrowseButton.setText(ArchivesUIMessages.FilesetInfoWizardPage_rootDirWorkspaceBrowseButton_label);
rootDirFilesystemBrowseButton.setText(ArchivesUIMessages.FilesetInfoWizardPage_rootDirFilesystemBrowseButton_label);
@@ -260,13 +237,13 @@
rootDirWorkspaceBrowseButton.addSelectionListener(new SelectionAdapter () {
public void widgetSelected(SelectionEvent e) {
- browseWorkspaceForRootDir();
+ //browseWorkspaceForRootDir();
}
});
rootDirFilesystemBrowseButton.addSelectionListener(new SelectionAdapter () {
public void widgetSelected(SelectionEvent e) {
- browseFilesystemForRootDir();
+ //browseFilesystemForRootDir();
}
});
@@ -292,31 +269,34 @@
return excludes;
}
- public boolean getFlatten() {
+ public boolean isFlattened() {
return flattened;
}
- public String getAbsoluteRootDir () {
- return rootDir.toOSString();
+ public boolean isRootDirWorkspaceRelative () {
+ return workspaceRelative;
}
- public String getWorkspaceRelativeRootDir() {
- return workspaceRelativeRootDir;
+ public String getRawPath() {
+ return rawPath;
}
-
- public boolean isRootDirWorkspaceRelative () {
- return rootDirIsWorkspaceRelative;
+
+ public String replaceVariables() {
+ try {
+ return ArchivesCore.getInstance().getVFS().
+ performStringSubstitution(rawPath,
+ projectName, true);
+ } catch( CoreException ce ) {
+ }
+ return null;
}
private void fillDefaults () {
- String projectName = "";
IProject[] project = ResourcesPlugin.getWorkspace().getRoot().getProjects();
for( int i = 0; i < project.length; i++ )
if( project[i].getLocation().equals(parentNode.getProjectPath()))
projectName = project[i].getName();
-
- rootProjectLabel.setText(projectName);
-
+
if (fileset != null) {
if (fileset.getIncludesPattern() != null) {
includes = fileset.getIncludesPattern();
@@ -327,22 +307,21 @@
excludesText.setText(excludes);
}
- if (fileset.getGlobalSourcePath() != null) {
- rootDir = fileset.getGlobalSourcePath();
- workspaceRelativeRootDir = fileset.getSourcePath().toString();
- rootDirIsWorkspaceRelative = fileset.isInWorkspace();
- rootDirText.setText(fileset.getSourcePath().toString());
+ if (fileset.getRawSourcePath() != null) {
+ rawPath = fileset.getRawSourcePath();
+ rootDirText.setText(rawPath);
}
+ workspaceRelative = fileset.isInWorkspace();
flattened = fileset.isFlattened();
flattenedYes.setSelection(flattened);
flattenedNo.setSelection(!flattened);
} else {
- rootDirIsWorkspaceRelative = true;
- rootDir = parentNode.getProjectPath();
- workspaceRelativeRootDir = projectName;
+ rawPath = "${current_project}";
+ workspaceRelative = true;
flattened = false;
+ rootDirText.setText(rawPath);
flattenedYes.setSelection(flattened);
flattenedNo.setSelection(!flattened);
}
@@ -350,9 +329,8 @@
}
private void changePreview() {
- IPath path = rootDirIsWorkspaceRelative ? new Path(workspaceRelativeRootDir) : rootDir;
DirectoryScannerExtension ds = DirectoryScannerFactory.createDirectoryScanner(
- path, null, includes, excludes, rootDirIsWorkspaceRelative, true);
+ replaceVariables(), null, includes, excludes, parentNode.getProjectName(), workspaceRelative, true);
String[] fsRelative = ds.getIncludedFiles();
IPath filesetRelative;
ArrayList<IPath> list = new ArrayList<IPath>();
@@ -367,7 +345,7 @@
previewComposite.setInput(list.toArray());
}
-
+ /*
private void browseWorkspaceForRootDir () {
IContainer workspaceRoot = ResourcesPlugin.getWorkspace().getRoot();
ContainerSelectionDialog dialog = new ContainerSelectionDialog(getShell(), workspaceRoot, true,
@@ -413,5 +391,6 @@
changePreview();
}
}
+ */
}
Added: trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE1406/.classpath
===================================================================
--- trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE1406/.classpath (rev 0)
+++ trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE1406/.classpath 2008-07-08 00:15:46 UTC (rev 9082)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Added: trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE1406/.packages
===================================================================
--- trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE1406/.packages (rev 0)
+++ trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE1406/.packages 2008-07-08 00:15:46 UTC (rev 9082)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<packages>
+ <package name="JBIDE1406.jar" type="jar" todir="${current.project}/output" exploded="true" inWorkspace="true">
+ <fileset dir="${current.project}" includes="**" excludes="**/*.jar" inWorkspace="true" flatten="false">
+ <properties></properties>
+ </fileset>
+ <properties>
+ <property name="org.jboss.ide.eclipse.as.core.packages.ModuleIDPropertyKey" value="1214949466221"></property>
+ </properties>
+ </package>
+ <properties></properties>
+</packages>
\ No newline at end of file
Added: trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE1406/.project
===================================================================
--- trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE1406/.project (rev 0)
+++ trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE1406/.project 2008-07-08 00:15:46 UTC (rev 9082)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>JBIDE1406</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.jboss.ide.eclipse.archives.core.archivesBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.jboss.ide.eclipse.archives.core.archivesNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Added: trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE1406/src/in.properties
===================================================================
--- trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE1406/src/in.properties (rev 0)
+++ trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE1406/src/in.properties 2008-07-08 00:15:46 UTC (rev 9082)
@@ -0,0 +1 @@
+this=test
\ No newline at end of file
Modified: trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/ArchivesTestSuite.java
===================================================================
--- trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/ArchivesTestSuite.java 2008-07-07 15:46:34 UTC (rev 9081)
+++ trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/ArchivesTestSuite.java 2008-07-08 00:15:46 UTC (rev 9082)
@@ -9,6 +9,7 @@
import org.jboss.ide.eclipse.archives.test.model.ModelUtilTest;
import org.jboss.ide.eclipse.archives.test.model.XBMarshallTest;
import org.jboss.ide.eclipse.archives.test.model.XBUnmarshallTest;
+import org.jboss.ide.eclipse.archives.test.projects.JBIDE1406Test;
import org.jboss.ide.eclipse.archives.test.projects.JBIDE2099Test;
import org.jboss.ide.eclipse.archives.test.projects.JBIDE2296Test;
import org.jboss.ide.eclipse.archives.test.projects.JBIDE2311Test;
@@ -28,6 +29,7 @@
suite.addTestSuite(ModelTruezipBridgeTest.class);
// jiras
+ suite.addTestSuite(JBIDE1406Test.class);
suite.addTestSuite(JBIDE2099Test.class);
suite.addTestSuite(JBIDE2296Test.class);
suite.addTestSuite(JBIDE2311Test.class);
Modified: trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/model/ModelTest.java
===================================================================
--- trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/model/ModelTest.java 2008-07-07 15:46:34 UTC (rev 9081)
+++ trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/model/ModelTest.java 2008-07-08 00:15:46 UTC (rev 9082)
@@ -47,7 +47,7 @@
protected IArchiveFileSet createFileSet(String includes, String path) {
IArchiveFileSet fs = ArchiveNodeFactory.createFileset();
fs.setIncludesPattern(includes);
- fs.setSourcePath(new Path(path));
+ fs.setRawSourcePath( path );
return fs;
}
Modified: trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/model/ModelUtilTest.java
===================================================================
--- trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/model/ModelUtilTest.java 2008-07-07 15:46:34 UTC (rev 9081)
+++ trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/model/ModelUtilTest.java 2008-07-08 00:15:46 UTC (rev 9082)
@@ -73,14 +73,14 @@
IArchiveFileSet outerFileset = ArchiveNodeFactory.createFileset();
outerFileset.setInWorkspace(false);
- outerFileset.setSourcePath(fileTrees.append("misc"));
+ outerFileset.setRawSourcePath(fileTrees.append("misc").toString());
outerFileset.setExcludesPattern("**/*.gif,**/*.png");
outerFileset.setIncludesPattern("**/*");
topFolder.addChild(outerFileset);
IArchiveFileSet imageFileset = ArchiveNodeFactory.createFileset();
imageFileset.setInWorkspace(false);
- imageFileset.setSourcePath(fileTrees.append("misc"));
+ imageFileset.setRawSourcePath(fileTrees.append("misc").toString());
imageFileset.setIncludesPattern("**/*.gif,**/*.png,**/*.xml");
images.addChild(imageFileset);
@@ -140,7 +140,7 @@
IArchiveFileSet otherFS = ArchiveNodeFactory.createFileset();
otherFS.setIncludesPattern(xmlFS[0].getIncludesPattern());
otherFS.setInWorkspace(xmlFS[0].isInWorkspace());
- otherFS.setSourcePath(xmlFS[0].getSourcePath());
+ otherFS.setRawSourcePath(xmlFS[0].getRawSourcePath());
xmlFS[0].getParent().addChild(otherFS);
assertTrue(testMatches(xmlFS[0], xml, rootArchive));
Added: trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/model/StringSubstitutionTest.java
===================================================================
--- trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/model/StringSubstitutionTest.java (rev 0)
+++ trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/model/StringSubstitutionTest.java 2008-07-08 00:15:46 UTC (rev 9082)
@@ -0,0 +1,57 @@
+package org.jboss.ide.eclipse.archives.test.model;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.Path;
+import org.jboss.ide.eclipse.archives.core.ArchivesCore;
+import org.jboss.ide.eclipse.archives.core.model.other.internal.WorkspaceVFS;
+
+public class StringSubstitutionTest extends TestCase {
+
+ private static final String ONE = "/this/is/a/test";
+ private static final String TWO = "${nonexistant}/this/is/a/test";
+
+ public void testNoVariables() {
+ WorkspaceVFS vfs = (WorkspaceVFS)ArchivesCore.getInstance().getVFS();
+ try {
+ String out1 = vfs.performStringSubstitution(ONE, true);
+ assertEquals(ONE, out1);
+ } catch( CoreException ce ) {
+ fail();
+ }
+ }
+
+ public void testVariableNotSet() {
+ WorkspaceVFS vfs = (WorkspaceVFS)ArchivesCore.getInstance().getVFS();
+ try {
+ vfs.performStringSubstitution(TWO, true);
+ } catch( CoreException ce ) {
+ return;
+ }
+ fail();
+ }
+
+ public void testVariableNotSet2() {
+ WorkspaceVFS vfs = (WorkspaceVFS)ArchivesCore.getInstance().getVFS();
+ try {
+ String out2 = vfs.performStringSubstitution(TWO, false);
+ assertEquals(TWO, out2);
+ } catch( CoreException ce ) {
+ fail();
+ }
+ }
+
+ public void testSetVariable() {
+ try {
+ ResourcesPlugin.getWorkspace().getPathVariableManager().setValue("test_variable", new Path("/here"));
+ WorkspaceVFS vfs = (WorkspaceVFS)ArchivesCore.getInstance().getVFS();
+ String out = vfs.performStringSubstitution("${test_variable}", true);
+ assertEquals("/here", out);
+ ResourcesPlugin.getWorkspace().getPathVariableManager().setValue("test_variable", null);
+ } catch( CoreException ce ) {
+ fail();
+ }
+ }
+}
Added: trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/projects/JBIDE1406Test.java
===================================================================
--- trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/projects/JBIDE1406Test.java (rev 0)
+++ trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/projects/JBIDE1406Test.java 2008-07-08 00:15:46 UTC (rev 9082)
@@ -0,0 +1,47 @@
+package org.jboss.ide.eclipse.archives.test.projects;
+
+import junit.framework.AssertionFailedError;
+import junit.framework.TestCase;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.jboss.ide.eclipse.archives.core.build.ArchiveBuildDelegate;
+import org.jboss.ide.eclipse.archives.test.ArchivesTest;
+import org.jboss.tools.common.test.util.TestProjectProvider;
+
+public class JBIDE1406Test extends TestCase {
+ private TestProjectProvider provider;
+ private IProject project;
+ private IPath outputDir;
+ private IPath propsFile;
+ protected void setUp() throws Exception {
+ provider = new TestProjectProvider(ArchivesTest.PLUGIN_ID,
+ "inputs" + Path.SEPARATOR + "projects" + Path.SEPARATOR + "JBIDE1406",
+ null, true);
+ project = provider.getProject();
+ project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
+ outputDir = project.getLocation().append("output").append("JBIDE1406.jar");
+ propsFile = outputDir.append("src").append("in.properties");
+ }
+
+ protected void tearDown() throws Exception {
+ provider.dispose();
+ }
+
+ public void testJBIDE1406() {
+ ArchiveBuildDelegate delegate = new ArchiveBuildDelegate();
+ try {
+ delegate.fullProjectBuild(project.getLocation());
+ assertTrue(outputDir.toFile().isDirectory());
+ assertTrue(propsFile.toFile().exists());
+ assertTrue(propsFile.toFile().isFile());
+ } catch( AssertionFailedError afe) {
+ throw afe;
+ } catch( RuntimeException re ) {
+ fail(re.getMessage());
+ }
+ }
+}
Modified: trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/projects/JBIDE2099Test.java
===================================================================
--- trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/projects/JBIDE2099Test.java 2008-07-07 15:46:34 UTC (rev 9081)
+++ trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/projects/JBIDE2099Test.java 2008-07-08 00:15:46 UTC (rev 9082)
@@ -1,5 +1,6 @@
package org.jboss.ide.eclipse.archives.test.projects;
+import junit.framework.AssertionFailedError;
import junit.framework.TestCase;
import org.eclipse.core.resources.IProject;
@@ -34,8 +35,10 @@
try {
delegate.fullProjectBuild(project.getLocation());
assertTrue(outputWar.toFile().isDirectory());
+ } catch( AssertionFailedError afe) {
+ throw afe;
} catch( RuntimeException re ) {
- fail();
+ fail(re.getMessage());
}
}
}
Modified: trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/projects/JBIDE2311Test.java
===================================================================
--- trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/projects/JBIDE2311Test.java 2008-07-07 15:46:34 UTC (rev 9081)
+++ trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/projects/JBIDE2311Test.java 2008-07-08 00:15:46 UTC (rev 9082)
@@ -1,5 +1,6 @@
package org.jboss.ide.eclipse.archives.test.projects;
+import junit.framework.AssertionFailedError;
import junit.framework.TestCase;
import org.eclipse.core.resources.IProject;
@@ -30,8 +31,10 @@
ArchiveBuildDelegate delegate = new ArchiveBuildDelegate();
try {
delegate.fullProjectBuild(project.getLocation());
+ } catch( AssertionFailedError afe ) {
+ throw afe;
} catch( RuntimeException re ) {
- fail();
+ fail(re.getMessage());
}
}
}
Modified: trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/projects/JBIDE2315Test.java
===================================================================
--- trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/projects/JBIDE2315Test.java 2008-07-07 15:46:34 UTC (rev 9081)
+++ trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/projects/JBIDE2315Test.java 2008-07-08 00:15:46 UTC (rev 9082)
@@ -1,5 +1,6 @@
package org.jboss.ide.eclipse.archives.test.projects;
+import junit.framework.AssertionFailedError;
import junit.framework.TestCase;
import org.eclipse.core.resources.IProject;
@@ -30,6 +31,8 @@
ArchiveBuildDelegate delegate = new ArchiveBuildDelegate();
try {
delegate.fullProjectBuild(project.getLocation());
+ } catch( AssertionFailedError afe ) {
+ throw afe;
} catch( RuntimeException re ) {
fail(re.getMessage());
}
Modified: trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/projects/JBIDE2439Test.java
===================================================================
--- trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/projects/JBIDE2439Test.java 2008-07-07 15:46:34 UTC (rev 9081)
+++ trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/projects/JBIDE2439Test.java 2008-07-08 00:15:46 UTC (rev 9082)
@@ -2,6 +2,7 @@
import java.util.ArrayList;
+import junit.framework.AssertionFailedError;
import junit.framework.TestCase;
import org.eclipse.core.resources.IFile;
@@ -55,7 +56,7 @@
delegate.fullProjectBuild(aProject.getLocation());
aProject.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
IResource outs = aProject.getFolder("outputs");
- final ArrayList list = new ArrayList();
+ final ArrayList<IResource> list = new ArrayList<IResource>();
outs.accept(new IResourceVisitor() {
public boolean visit(IResource resource) throws CoreException {
@@ -66,6 +67,8 @@
}
});
assertEquals(5, list.size());
+ } catch( AssertionFailedError afe ) {
+ throw afe;
} catch( RuntimeException re ) {
fail(re.getMessage());
} catch( CoreException ce ) {
15 years, 9 months
- 1
- 0
JBoss Tools SVN: r9081 - trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template.
by jbosstools-commits＠lists.jboss.org
Author: estherbin
Date: 2008-07-07 11:46:34 -0400 (Mon, 07 Jul 2008)
New Revision: 9081
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesComboBoxTemplate.java
Log:
Fix bug http://jira.jboss.com/jira/browse/JBIDE-2430
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-07-07 15:23:26 UTC (rev 9080)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesComboBoxTemplate.java 2008-07-07 15:46:34 UTC (rev 9081)
@@ -212,8 +212,8 @@
thirdDiv.appendChild(forthEmptyDiv);
final VpeCreationData creationData = new VpeCreationData(rootDiv);
- final DOMTreeDumper dumper = new DOMTreeDumper();
- dumper.dumpToStream(System.err, rootDiv);
+// final DOMTreeDumper dumper = new DOMTreeDumper();
+// dumper.dumpToStream(System.err, rootDiv);
return creationData;
}
15 years, 9 months
- 1
- 0
JBoss Tools SVN: r9080 - in trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces: src/org/jboss/tools/jsf/vpe/richfaces/template and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: estherbin
Date: 2008-07-07 11:23:26 -0400 (Mon, 07 Jul 2008)
New Revision: 9080
Added:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/comboBox/bg_shadow.png
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/comboBox/spacer.gif
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/comboBox/comboBox.css
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesAbstractInplaceTemplate.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesComboBoxTemplate.java
Log:
Fix bug http://jira.jboss.com/jira/browse/JBIDE-2430
Added: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/comboBox/bg_shadow.png
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/comboBox/bg_shadow.png
___________________________________________________________________
Name: svn:mime-type
+ image/png
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/comboBox/comboBox.css
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/comboBox/comboBox.css 2008-07-07 14:57:59 UTC (rev 9079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/comboBox/comboBox.css 2008-07-07 15:23:26 UTC (rev 9080)
@@ -48,7 +48,6 @@
font-size: 11px;
}
-
.rich-combobox-button-background {
background-color: #E3DED5;
background-image: url(background-arrows.jpg);
@@ -89,4 +88,64 @@
position: relative;
visibility: hidden;
width: 240px;
+}
+
+.rich-combobox-shadow {
+ position: absolute;
+}
+
+.rich-combobox-list-cord {
+ position: relative;
+}
+
+.rich-combobox-shadow-tl {
+ background-position: left top;
+ background-repeat: repeat-x;
+ background-image: url(bg_shadow.png);
+}
+
+.rich-combobox-shadow-tr {
+ background-position: right top;
+ background-repeat: repeat-x;
+ background-image: url(bg_shadow.png);
+}
+
+.rich-combobox-shadow-bl {
+ background-position: left bottom;
+ background-repeat: repeat-x;
+ background-image: url(bg_shadow.png);
+}
+
+.rich-combobox-shadow-br {
+ background-position: right bottom;
+ background-repeat: repeat-x;
+ background-image: url(bg_shadow.png);
+}
+
+.rich-combobox-list-position {
+ left: 0pt;
+ position: absolute;
+ top: 1px;
+}
+
+.rich-combobox-list-decoration {
+ background: #FFFFFF none repeat scroll 0%;
+ border-color: #C4C0B9;
+ background: #FFFFFF none repeat scroll 0%;
+ border: 1px solid #C0C0C0;
+ padding: 0pt;
+}
+
+.rich-combobox-list-scroll {
+ overflow-x: hidden;
+ overflow-y: auto;
+}
+
+.rich-combobox-item {
+ display: block;
+ padding: 2px;
+ white-space: nowrap;
+ color: #000000;
+ font-family: Arial, Verdana, sans-serif;
+ font-size: 11px;
}
\ No newline at end of file
Added: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/comboBox/spacer.gif
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/comboBox/spacer.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesAbstractInplaceTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesAbstractInplaceTemplate.java 2008-07-07 14:57:59 UTC (rev 9079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesAbstractInplaceTemplate.java 2008-07-07 15:23:26 UTC (rev 9080)
@@ -80,7 +80,7 @@
protected static final String RICH_INPLACE_VIEW_DEFAULT_STYLE_CLASS = "rich-inplace-view";
/** The Constant VPE_USER_TOGGLE_ID_ATTR. */
- protected static final String VPE_USER_TOGGLE_ID_ATTR = "vpe-user-toggle-id";
+ public static final String VPE_USER_TOGGLE_ID_ATTR = "vpe-user-toggle-id";
/** The button images. */
protected final Map<String, String> buttonImages = new HashMap<String, String>();
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-07-07 14:57:59 UTC (rev 9079)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesComboBoxTemplate.java 2008-07-07 15:23:26 UTC (rev 9080)
@@ -13,32 +13,38 @@
package org.jboss.tools.jsf.vpe.richfaces.template;
+import java.text.MessageFormat;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import org.jboss.tools.jsf.vpe.richfaces.ComponentUtil;
import org.jboss.tools.jsf.vpe.richfaces.HtmlComponentUtil;
import org.jboss.tools.jsf.vpe.richfaces.template.util.RichFaces;
+import org.jboss.tools.vpe.editor.VpeVisualDomBuilder;
import org.jboss.tools.vpe.editor.context.VpePageContext;
import org.jboss.tools.vpe.editor.mapping.AttributeData;
-import org.jboss.tools.vpe.editor.mapping.NodeData;
import org.jboss.tools.vpe.editor.mapping.VpeElementData;
import org.jboss.tools.vpe.editor.template.VpeCreationData;
+import org.jboss.tools.vpe.editor.template.VpeToggableTemplate;
import org.jboss.tools.vpe.editor.util.HTML;
import org.jboss.tools.vpe.editor.util.VpeStyleUtil;
+import org.jboss.tools.vpe.xulrunner.browser.util.DOMTreeDumper;
import org.mozilla.interfaces.nsIDOMDocument;
import org.mozilla.interfaces.nsIDOMElement;
import org.mozilla.interfaces.nsIDOMNode;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
+import com.sun.org.apache.xerces.internal.impl.xpath.regex.ParseException;
+
/**
* The Class RichFacesComboBox2Template.
*
* @author Eugene Stherbin
*/
-public class RichFacesComboBoxTemplate extends AbstractEditableRichFacesTemplate {
+public class RichFacesComboBoxTemplate extends AbstractEditableRichFacesTemplate implements VpeToggableTemplate {
/** CSS_FILE_NAME. */
private static final String CSS_FILE_NAME = "comboBox/comboBox.css";
@@ -72,7 +78,7 @@
/** The Constant STYLE_EXT. */
private static final String STYLE_EXT = "richFacesComboBox";
- private static Map<String, String> styleClasess = new HashMap<String, String>();
+ private Map<String, String> styleClasess = new HashMap<String, String>();
/** The Constant ZERO_STRING. */
private static final String ZERO_STRING = "0";
@@ -90,6 +96,20 @@
private String sourceValue;
private String sourceWidth;
+
+ private String sourceStyle;
+
+ private String sourceInputStyle;
+
+ private String sourceInputClass;
+
+ private boolean isToggle = false;
+
+ private String sourceListStyle;
+
+ private String sourceListClass;
+
+ private String sourceItemClass;
/**
*
@@ -126,22 +146,24 @@
final nsIDOMElement secondDiv = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_DIV);
secondDiv.setAttribute("align", this.sourceAlign);
secondDiv.setAttribute(HTML.ATTR_CLASS, styleClasess.get("secondDiv"));
+ String secondDivSubStyle = "; position: {0}; z-index: {1} ;";
+ if(isToggle){
+ secondDivSubStyle = MessageFormat.format(secondDivSubStyle, "relative","2");
+ }else{
+ secondDivSubStyle = MessageFormat.format(secondDivSubStyle,"static","0");
+ }
// TODO add ATTR_STYLE.
- secondDiv.setAttribute(HTML.ATTR_STYLE, VpeStyleUtil.PARAMETER_WIDTH + VpeStyleUtil.COLON_STRING + this.sourceListWidth);
+ secondDiv.setAttribute(HTML.ATTR_STYLE, VpeStyleUtil.PARAMETER_WIDTH + VpeStyleUtil.COLON_STRING + this.sourceListWidth+VpeStyleUtil.SEMICOLON_STRING+secondDivSubStyle+sourceStyle);
final nsIDOMElement thirdDiv = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_DIV);
thirdDiv.setAttribute(HTML.ATTR_CLASS, styleClasess.get("thirdDiv"));
thirdDiv.setAttribute(HTML.ATTR_STYLE, VpeStyleUtil.PARAMETER_WIDTH + VpeStyleUtil.COLON_STRING + this.sourceWidth
- + "; z-index: 1;");
-
- final nsIDOMElement thirdEmptyDiv = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_DIV);
- thirdEmptyDiv.setAttribute(HTML.ATTR_CLASS, styleClasess.get("thirdEmptyDiv"));
-
+ + "; z-index: 1;");
final nsIDOMElement firstInput = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_INPUT);
firstInput.setAttribute(HTML.ATTR_TYPE, "text");
;
- firstInput.setAttribute(HTML.ATTR_CLASS, styleClasess.get("firstInput"));
+ firstInput.setAttribute(HTML.ATTR_CLASS, styleClasess.get("firstInput")+" "+sourceInputClass);
firstInput.setAttribute("autocomplete", "off");
- firstInput.setAttribute(HTML.ATTR_STYLE, "width: " + calculateWithForDiv(this.sourceWidth, 17));
+ firstInput.setAttribute(HTML.ATTR_STYLE, "width: " + calculateWithForDiv(this.sourceWidth, 17)+VpeStyleUtil.SEMICOLON_STRING+sourceInputStyle);
String value = null;
if (ComponentUtil.isNotBlank(this.sourceDefaultLabel)) {
value = this.sourceDefaultLabel;
@@ -157,6 +179,7 @@
;
secondInput.setAttribute(HTML.ATTR_CLASS, styleClasess.get(SECOND_INPUT));
secondInput.setAttribute("readonly", String.valueOf(Boolean.TRUE));
+ secondInput.setAttribute(RichFacesAbstractInplaceTemplate.VPE_USER_TOGGLE_ID_ATTR, String.valueOf(0));
if (this.sourceButtonStyle != null) {
secondInput.setAttribute(HTML.ATTR_STYLE, sourceButtonStyle);
}
@@ -166,6 +189,7 @@
;
thirdInput.setAttribute(HTML.ATTR_CLASS, styleClasess.get("thirdInput"));
thirdInput.setAttribute("readonly", String.valueOf(Boolean.TRUE));
+ thirdInput.setAttribute(RichFacesAbstractInplaceTemplate.VPE_USER_TOGGLE_ID_ATTR, String.valueOf(0));
if (this.sourceButtonStyle != null) {
thirdInput.setAttribute(HTML.ATTR_STYLE, sourceButtonStyle);
}
@@ -177,19 +201,142 @@
forthEmptyDiv.appendChild(visualDocument.createTextNode("Struts"));
rootDiv.appendChild(secondDiv);
- secondDiv.appendChild(thirdEmptyDiv);
+
secondDiv.appendChild(thirdDiv);
+ if(isToggle){
+ secondDiv.appendChild(createToogleDiv(pageContext,source,visualDocument));
+ }
thirdDiv.appendChild(firstInput);
thirdDiv.appendChild(secondInput);
thirdDiv.appendChild(thirdInput);
thirdDiv.appendChild(forthEmptyDiv);
final VpeCreationData creationData = new VpeCreationData(rootDiv);
-// final DOMTreeDumper dumper = new DOMTreeDumper();
-// dumper.dumpToStream(System.err, rootDiv);
+ final DOMTreeDumper dumper = new DOMTreeDumper();
+ dumper.dumpToStream(System.err, rootDiv);
+
return creationData;
}
+ private nsIDOMNode createToogleDiv(VpePageContext pageContext, Element source, nsIDOMDocument visualDocument) {
+
+ final nsIDOMElement thirdEmptyDiv = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_DIV);
+
+ thirdEmptyDiv.setAttribute(HTML.ATTR_STYLE,
+ this.sourceListStyle+VpeStyleUtil.SEMICOLON_STRING+" z-index: 3; position: absolute; visibility: visible; top: 16px; left: 0px;");
+ thirdEmptyDiv.setAttribute(HTML.ATTR_CLASS, styleClasess.get("thirdEmptyDiv")+" "+this.sourceListClass);
+ thirdEmptyDiv.setAttribute(HTML.ATTR_STYLE, "z-index: 3; position: absolute; visibility: visible; top: 16px; left: 0px;");
+
+ final nsIDOMElement shadovDiv = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_DIV);
+
+ final nsIDOMElement positionDiv = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_DIV);
+
+ positionDiv.setAttribute(HTML.ATTR_CLASS,"rich-combobox-list-position");
+
+ final nsIDOMElement decorationDiv= visualDocument.createElement(HtmlComponentUtil.HTML_TAG_DIV);
+
+ decorationDiv.setAttribute(HTML.ATTR_CLASS, "rich-combobox-list-decoration");
+// decorationDiv.setAttribute(HTML.ATTR_STYLE, "height: 54px; width: 208px;");
+
+ final nsIDOMElement scrollDiv= visualDocument.createElement(HtmlComponentUtil.HTML_TAG_DIV);
+ scrollDiv.setAttribute(HTML.ATTR_CLASS, "rich-combobox-list-scroll");
+ scrollDiv.setAttribute(HTML.ATTR_STYLE, "height: 54px; width: "+calculateWithForDiv(sourceWidth, 2));
+
+ final List<Element> selectItems = ComponentUtil.getSelectItems(source.getChildNodes());
+
+ if(selectItems.size() > 0){
+ for(Element e:selectItems){
+ scrollDiv.appendChild(createSelectItem(e,visualDocument));
+ }
+ }
+
+ shadovDiv.setAttribute(HTML.ATTR_CLASS, "rich-combobox-shadow");
+
+ final nsIDOMElement table = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_TABLE);
+ table.setAttribute(HTML.ATTR_CELLPADDING, "0");
+ table.setAttribute(HTML.ATTR_CELLSPACING, "0");
+ table.setAttribute(HTML.ATTR_BORDER, "0");
+ String width = "";
+ try {
+ int w = ComponentUtil.parseWidthHeightValue(sourceWidth);
+ w+=7;
+ width = String.valueOf(w);
+ } catch (ParseException e) {
+ width="217";
+ }
+ table.setAttribute(HTML.ATTR_STYLE, "width: "+width+"px ; height: 63px;");
+
+
+ final nsIDOMElement tr1 = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_TR);
+ final nsIDOMElement tr2 = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_TR);
+
+ final nsIDOMElement tr1_td1 = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_TD);
+ final nsIDOMElement tr1_td2 = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_TD);
+
+ final nsIDOMElement tr2_td1 = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_TD);
+ final nsIDOMElement tr2_td2 = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_TD);
+
+ final nsIDOMElement tr1_td1_img = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_IMG);
+ final nsIDOMElement tr1_td2_img = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_IMG);
+
+
+ final nsIDOMElement tr2_td1_img = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_IMG);
+ final nsIDOMElement tr2_td2_img = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_IMG);
+
+
+ tr1_td1.setAttribute(HTML.ATTR_CLASS, "rich-combobox-shadow-tl");
+ tr1_td2.setAttribute(HTML.ATTR_CLASS, "rich-combobox-shadow-tr");
+
+
+
+ tr2_td1.setAttribute(HTML.ATTR_CLASS, "rich-combobox-shadow-bl");
+ tr2_td2.setAttribute(HTML.ATTR_CLASS, "rich-combobox-shadow-br");
+
+
+ setUpImg(tr1_td1_img, 10, 1, 0,"comboBox/spacer.gif");
+ setUpImg(tr1_td2_img, 1, 10, 0,"comboBox/spacer.gif");
+ setUpImg(tr2_td1_img, 1, 10, 0,"comboBox/spacer.gif");
+ setUpImg(tr2_td2_img, 10, 1, 0,"comboBox/spacer.gif");
+
+ thirdEmptyDiv.appendChild(shadovDiv);
+ shadovDiv.appendChild(table);
+ thirdEmptyDiv.appendChild(positionDiv);
+ positionDiv.appendChild(decorationDiv);
+ decorationDiv.appendChild(scrollDiv);
+
+ table.appendChild(tr1);
+ table.appendChild(tr2);
+ tr1.appendChild(tr1_td1);
+ tr1.appendChild(tr1_td2);
+
+ tr2.appendChild(tr2_td1);
+ tr2.appendChild(tr2_td2);
+
+ tr1_td1.appendChild(tr1_td1_img);
+ tr1_td1.appendChild(visualDocument.createElement(HtmlComponentUtil.HTML_TAG_BR));
+
+ tr1_td2.appendChild(tr1_td2_img);
+ tr1_td2.appendChild(visualDocument.createElement(HtmlComponentUtil.HTML_TAG_BR));
+
+
+ tr2_td1.appendChild(tr2_td1_img);
+ tr2_td1.appendChild(visualDocument.createElement(HtmlComponentUtil.HTML_TAG_BR));
+
+ tr2_td2.appendChild(tr2_td2_img);
+ tr2_td2.appendChild(visualDocument.createElement(HtmlComponentUtil.HTML_TAG_BR));
+
+
+ return thirdEmptyDiv;
+ }
+
+ private nsIDOMNode createSelectItem(Element e,nsIDOMDocument visualDocument) {
+ final nsIDOMElement item = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_SPAN);
+
+ item.setAttribute(HTML.ATTR_CLASS, "rich-combobox-item "+sourceItemClass);
+ item.appendChild(visualDocument.createTextNode(ComponentUtil.getSelectItemValue(e)));
+ return item;
+ }
+
/**
* Creates the button table.
*
@@ -202,7 +349,6 @@
*/
private nsIDOMElement createButtonTable(nsIDOMDocument visualDocument, Node sourceNode) {
nsIDOMElement table = visualDocument.createElement(HTML.TAG_TABLE);
-
setUpTable(table);
nsIDOMElement rowUp = visualDocument.createElement(HTML.TAG_TR);
@@ -390,16 +536,23 @@
this.sourceWidth = DEFAULT_LIST_WIDTH;
}
- this.sourceDefaultLabel = source.getAttribute("defaultLabel");
- this.sourceValue = source.getAttribute("value");
+ this.sourceDefaultLabel = ComponentUtil.getAttribute(source,"defaultLabel");
+ this.sourceValue = ComponentUtil.getAttribute(source,"value");
- this.sourceButtonStyle = source.getAttribute("buttonStyle");
+ this.sourceButtonStyle = ComponentUtil.getAttribute(source,"buttonStyle");
- final String sourceStyleClasess = source.getAttribute(RichFaces.ATTR_STYLE_CLASS);
+ final String sourceStyleClasess = ComponentUtil.getAttribute(source,RichFaces.ATTR_STYLE_CLASS);
if (ComponentUtil.isNotBlank(sourceStyleClasess)) {
styleClasess.put("secondDiv", styleClasess.get("secondDiv") + " " + sourceStyleClasess);
}
+
+ this.sourceStyle = ComponentUtil.getAttribute(source,HTML.ATTR_STYLE);
+ this.sourceInputStyle = ComponentUtil.getAttribute(source,"inputStyle");
+ this.sourceInputClass = ComponentUtil.getAttribute(source,"inputClass");
+ this.sourceListClass = ComponentUtil.getAttribute(source,"listClass");
+ this.sourceListStyle = ComponentUtil.getAttribute(source,"listStyle");
+ this.sourceItemClass = ComponentUtil.getAttribute(source,"itemClass");
}
@@ -462,8 +615,28 @@
// table.setAttribute(HTML.ATTR_STYLE, strStyle);
}
+
+
/**
+ * Sets the up img.
+ *
+ * @param i * @param width the width
+ * @param height the height
+ * @param img the img
+ * @param image the image
+ * @param j * @param border the border
+ * @param td1Img */
+ protected void setUpImg(nsIDOMElement img, int width, int height, int border, String image) {
+ ComponentUtil.setImg(img, image);
+ img.setAttribute(HTML.ATTR_WIDTH, String.valueOf(width));
+ img.setAttribute(HTML.ATTR_HEIGHT, String.valueOf(height));
+ img.setAttribute(HTML.ATTR_BORDER, String.valueOf(border));
+
+ }
+
+
+ /**
* Sets the up table.
*
* @param table
@@ -494,11 +667,14 @@
cellInput.appendChild(createInputElement(visualDocument, source, elementData));
}
- // @Override
- // public boolean isRecreateAtAttrChange(VpePageContext pageContext, Element
- // sourceElement, nsIDOMDocument visualDocument,
- // nsIDOMElement visualNode, Object data, String name, String value) {
- // return true;
- // }
+ public void stopToggling(Node sourceNode) {
+ isToggle = false;
+
+ }
+ public void toggle(VpeVisualDomBuilder builder, Node sourceNode, String toggleId) {
+ isToggle = !isToggle;
+
+ }
+
}
15 years, 9 months
- 1
- 0
JBoss Tools SVN: r9079 - trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2008-07-07 10:57:59 -0400 (Mon, 07 Jul 2008)
New Revision: 9079
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ConnectionFigure.java
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/PageFigure.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1189
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ConnectionFigure.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ConnectionFigure.java 2008-07-07 14:22:25 UTC (rev 9078)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ConnectionFigure.java 2008-07-07 14:57:59 UTC (rev 9079)
@@ -87,8 +87,13 @@
PointList points;
Point point;
+ /**
+ * begin ,end points
+ */
Point beg = new Point(0, 0), end = new Point(0, 0);
- Point corner = new Point(0, 0);
+
+ Point bCorner = new Point(0, 0);
+ Point eCorner = new Point(0, 0);
boolean horiz;
private boolean selected;
@@ -125,50 +130,47 @@
else
horiz = false;
+ eCorner.x = 0;
if (i != 1) {
if (horiz) {
if (end.x > beg.x) {
- corner.x = beg.x + 1;
beg.x += 2;
} else {
- corner.x = beg.x - 1;
beg.x -= 2;
}
} else {
if (end.y > beg.y) {
- corner.y = beg.y + 1;
beg.y += 2;
} else {
- corner.y = beg.y - 1;
beg.y -= 2;
}
}
+ eCorner.x = beg.x;
+ eCorner.y = beg.y;
}
- if (corner.x != 0)
- g.drawLine(corner, corner);
- corner.x = 0;
+
+ if (bCorner.x != 0 && eCorner.x != 0)
+ g.drawLine(bCorner, eCorner);
+ bCorner.x = 0;
if (i != points.size() - 1) {
if (horiz) {
if (end.x > beg.x) {
- corner.x = end.x - 1;
end.x -= 2;
-
} else {
- corner.x = end.x + 1;
end.x += 2;
}
} else {
if (end.y > beg.y) {
- corner.y = end.y - 1;
end.y -= 2;
} else {
- corner.y = end.y + 1;
end.y += 2;
}
}
+ bCorner.x = end.x;
+ bCorner.y = end.y;
}
-
+
g.drawLine(beg, end);
point = points.getPoint(i);
beg.x = point.x;
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/PageFigure.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/PageFigure.java 2008-07-07 14:22:25 UTC (rev 9078)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/PageFigure.java 2008-07-07 14:57:59 UTC (rev 9079)
@@ -72,7 +72,7 @@
if (group != null) {
FixedConnectionAnchor c;
c = new FixedConnectionAnchor(this);
- c.offsetV = 8;
+ c.offsetV = 10;
c.offsetH = -1;
connectionAnchors.put("1_IN", c);
inputConnectionAnchors.addElement(c);
15 years, 9 months
- 1
- 0
JBoss Tools SVN: r9078 - trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2008-07-07 10:22:25 -0400 (Mon, 07 Jul 2008)
New Revision: 9078
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/LinkEditPart.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1189
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/LinkEditPart.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/LinkEditPart.java 2008-07-04 14:16:57 UTC (rev 9077)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/LinkEditPart.java 2008-07-07 14:22:25 UTC (rev 9078)
@@ -218,15 +218,7 @@
refresh();
}
- if (getLinkFigure().isManual()
- && getLink().getPathFromModel().equals("")) {
- getLinkFigure().setManual(false);
- refresh();
- } else if (!getLinkFigure().isManual()
- && !getLink().getPathFromModel().equals("")) {
- getLinkFigure().setManual(true);
- refresh();
- }
+
}
@@ -258,9 +250,17 @@
*/
public void notifyChanged(Notification notification) {
pathLabel.setText(getLinkModel().getName());
- //TODO for shortCut
+ if (getLinkFigure().isManual()
+ && getLink().getPathFromModel().equals("")) {
+ getLinkFigure().setManual(false);
+ clear();
+ } else if (!getLinkFigure().isManual()
+ && !getLink().getPathFromModel().equals("")) {
+ getLinkFigure().setManual(true);
+ }
refresh();
refreshVisuals();
+ ((ConnectionFigure)figure).layout();
}
/**
15 years, 9 months
- 1
- 0
JBoss Tools SVN: r9077 - in trunk: common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/jsp and 7 other directories.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2008-07-04 10:16:57 -0400 (Fri, 04 Jul 2008)
New Revision: 9077
Added:
trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/JSFTextExtMessages.java
trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/JSFTextExtMessages.properties
trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/StrutsTextExtMessages.java
trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/StrutsTextExtMessages.properties
Modified:
trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/CSSClassHyperlink.java
trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/ClassHyperlink.java
trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/ClassMethodHyperlink.java
trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/FilterNameHyperlink.java
trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/JumpToHyperlink.java
trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/LinkHyperlink.java
trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/RelativeLinkHyperlink.java
trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/RoleNameHyperlink.java
trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/ServletNameHyperlink.java
trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/TLDAttributeNameHyperlink.java
trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/XModelBasedHyperlink.java
trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/jsp/JSPBeanGetPropertyHyperlink.java
trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/jsp/JSPBeanSetPropertyHyperlink.java
trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/jsp/JSPElementNameHyperlink.java
trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/jsp/JSPForBeanIdHyperlink.java
trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/jsp/JSPTaglibHyperlink.java
trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/jsp/JSPXmlNsHyperlink.java
trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xml/XMLElementAttributeValueHyperlinkPartitioner.java
trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xml/XMLXmlNsHyperlink.java
trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xpl/AbstractBaseHyperlink.java
trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xpl/Messages.java
trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xpl/Messages.properties
trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/BeanHyperlink.java
trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/BundleBasenameHyperlink.java
trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/BundleHyperlink.java
trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/ConverterHyperlink.java
trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/ForIDHyperlink.java
trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/ForwardHyperlink.java
trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPTagAttributeHyperlink.java
trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPTagNameHyperlink.java
trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPXmlNsHyperlink.java
trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfTaglibDirectiveHyperlink.java
trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/LoadBundleHyperlink.java
trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/NavigationCaseHyperlink.java
trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/PropertyHyperlink.java
trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/RenderKitHyperlink.java
trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/ValidatorHyperlink.java
trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamBeanHyperlink.java
trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamELInJavaStringHyperlink.java
trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsActionHyperlink.java
trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsActionMappingHyperlink.java
trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsBeanNameHyperlink.java
trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsBundleHyperlink.java
trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsBundleKeyHyperlink.java
trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsConfigBundleHyperlink.java
trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsConfigBundleKeyHyperlink.java
trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsConfigFormBeanHyperlink.java
trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsConfigFormPropertyHyperlink.java
trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsConfigForwardPathHyperlink.java
trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsConfigPageHyperlink.java
trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsConfigPluginSetPropertyHyperlink.java
trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsConfigSetPropertyHyperlink.java
trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsFormBeanHyperlink.java
trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsFormValidationBundleKeyHyperlink.java
trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsForwardHyperlink.java
trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsJSPTagAttributeHyperlink.java
trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsJSPTagNameHyperlink.java
trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsLinkHyperlink.java
trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsLogicPropertyHyperlink.java
trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsPageHyperlink.java
trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsPropertiesFileHyperlink.java
trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsPropertyHyperlink.java
trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsTaglibDirectiveHyperlink.java
trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsValidationBundleHyperlink.java
trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsValidationBundleKeyHyperlink.java
trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsValidationMethodHyperlink.java
trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsValidationMethodHyperlink0.java
trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsValidationPropertyHyperlink.java
trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsValidationValidatorHyperlink.java
trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsXModelBasedHyperlink.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-2391 Popups for elements contains strange names during the OpenOn calling
The issue is fixed.
Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/CSSClassHyperlink.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/CSSClassHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076)
+++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/CSSClassHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077)
@@ -12,6 +12,7 @@
import java.io.InputStream;
import java.io.StringReader;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.List;
import java.util.StringTokenizer;
@@ -24,7 +25,6 @@
import org.eclipse.jdt.core.IClasspathEntry;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.JavaCore;
-
import org.eclipse.jface.text.IRegion;
import org.eclipse.jface.text.rules.IToken;
import org.eclipse.ui.IEditorPart;
@@ -32,22 +32,19 @@
import org.eclipse.ui.ide.IDE;
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMText;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-
import org.jboss.tools.common.text.ext.ExtensionsPlugin;
-
-import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink;
+import org.jboss.tools.common.text.ext.hyperlink.jsp.JSPRootHyperlinkPartitioner;
+import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages;
import org.jboss.tools.common.text.ext.util.CSSTextScanner;
import org.jboss.tools.common.text.ext.util.RegionHolder;
import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
import org.jboss.tools.common.text.ext.util.StructuredSelectionHelper;
import org.jboss.tools.common.text.ext.util.TextScanner;
import org.jboss.tools.common.text.ext.util.Utils;
-import org.jboss.tools.common.text.ext.hyperlink.jsp.JSPRootHyperlinkPartitioner;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
/*
* Created on 26.01.2005
@@ -130,16 +127,14 @@
}
+ IRegion fLastRegion = null;
+
/**
* @see com.ibm.sse.editor.AbstractHyperlink#doGetHyperlinkRegion(int)
*/
protected IRegion doGetHyperlinkRegion(int offset) {
- try {
- return getRegion(offset);
- } catch (Exception x) {
- //ignore
- return null;
- }
+ fLastRegion = getRegion(offset);
+ return fLastRegion;
}
private RegionHolder getStyleHolder (String styleName) {
@@ -432,4 +427,17 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see IHyperlink#getHyperlinkText()
+ */
+ public String getHyperlinkText() {
+ String styleName = getStyleName(fLastRegion);
+ if (styleName == null)
+ return MessageFormat.format(Messages.OpenA, Messages.CSSStyle);
+
+ return MessageFormat.format(Messages.OpenCSSStyle, styleName);
+ }
+
}
\ No newline at end of file
Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/ClassHyperlink.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/ClassHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076)
+++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/ClassHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077)
@@ -10,6 +10,7 @@
******************************************************************************/
package org.jboss.tools.common.text.ext.hyperlink;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -18,7 +19,6 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
-
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.JavaCore;
@@ -29,7 +29,10 @@
import org.eclipse.jdt.core.search.SearchParticipant;
import org.eclipse.jdt.core.search.SearchPattern;
import org.eclipse.jdt.core.search.SearchRequestor;
-import org.eclipse.jdt.internal.core.*;
+import org.eclipse.jdt.internal.core.BinaryType;
+import org.eclipse.jdt.internal.core.PackageFragment;
+import org.eclipse.jdt.internal.core.PackageFragmentRoot;
+import org.eclipse.jdt.internal.core.SourceType;
import org.eclipse.jdt.ui.JavaUI;
import org.eclipse.jface.text.IRegion;
import org.eclipse.ui.IEditorInput;
@@ -37,17 +40,15 @@
import org.eclipse.ui.IStorageEditorInput;
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMAttr;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMText;
+import org.jboss.tools.common.text.ext.ExtensionsPlugin;
+import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages;
+import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
+import org.jboss.tools.common.text.ext.util.Utils;
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.Text;
-import org.jboss.tools.common.text.ext.ExtensionsPlugin;
-import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink;
-import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
-import org.jboss.tools.common.text.ext.util.Utils;
-
/**
* @author Jeremy
*/
@@ -173,14 +174,15 @@
}
}
+ IRegion fLastRegion = null;
/*
* (non-Javadoc)
*
* @see com.ibm.sse.editor.AbstractHyperlink#doGetHyperlinkRegion(int)
*/
protected IRegion doGetHyperlinkRegion(int offset) {
- IRegion region = getRegion(offset);
- return region;
+ fLastRegion = getRegion(offset);
+ return fLastRegion;
}
public IRegion getRegion (int offset) {
@@ -275,4 +277,17 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see IHyperlink#getHyperlinkText()
+ */
+ public String getHyperlinkText() {
+ String className = getClassName(fLastRegion);
+ if (className == null)
+ return MessageFormat.format(Messages.OpenA, Messages.Class);
+
+ return MessageFormat.format(Messages.OpenClass, className);
+ }
+
}
\ No newline at end of file
Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/ClassMethodHyperlink.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/ClassMethodHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076)
+++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/ClassMethodHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077)
@@ -34,17 +34,14 @@
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.IStorageEditorInput;
import org.eclipse.ui.IWorkbenchPage;
+import org.jboss.tools.common.text.ext.ExtensionsPlugin;
+import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
+import org.jboss.tools.common.text.ext.util.Utils;
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.Text;
-import org.jboss.tools.common.text.ext.ExtensionsPlugin;
-import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink;
-import org.jboss.tools.common.text.ext.hyperlink.HyperlinkRegion;
-import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
-import org.jboss.tools.common.text.ext.util.Utils;
-
/**
* @author Jeremy
*/
@@ -85,12 +82,13 @@
}
}
+ protected IRegion fLastRegion = null;
/**
* @see com.ibm.sse.editor.AbstractHyperlink#doGetHyperlinkRegion(int)
*/
protected IRegion doGetHyperlinkRegion(int offset) {
- IRegion region = getRegion(offset);
- return region;
+ fLastRegion = getRegion(offset);
+ return fLastRegion;
}
private IRegion getRegion(int offset) {
Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/FilterNameHyperlink.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/FilterNameHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076)
+++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/FilterNameHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077)
@@ -10,7 +10,7 @@
******************************************************************************/
package org.jboss.tools.common.text.ext.hyperlink;
-
+import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages;
/**
* @author Jeremy
*
@@ -21,4 +21,14 @@
protected String getDestinationAxis() {
return "/web-app/filter/filter-name/";
}
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see IHyperlink#getHyperlinkText()
+ */
+ public String getHyperlinkText() {
+ return Messages.BrowseToFilterNameDefinition;
+ }
+
}
Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/JumpToHyperlink.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/JumpToHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076)
+++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/JumpToHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077)
@@ -17,24 +17,22 @@
import org.eclipse.jface.text.Region;
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMText;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Text;
-
import org.jboss.tools.common.text.ext.ExtensionsPlugin;
-import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink;
+import org.jboss.tools.common.text.ext.hyperlink.xml.XMLRootHyperlinkPartitioner;
import org.jboss.tools.common.text.ext.util.RegionHolder;
import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
import org.jboss.tools.common.text.ext.util.StructuredSelectionHelper;
import org.jboss.tools.common.text.ext.util.Utils;
-import org.jboss.tools.common.text.ext.hyperlink.xml.XMLRootHyperlinkPartitioner;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.w3c.dom.Text;
/**
* @author Jeremy
*
*/
-public class JumpToHyperlink extends AbstractHyperlink {
+abstract public class JumpToHyperlink extends AbstractHyperlink {
/**
* @see com.ibm.sse.editor.AbstractHyperlink#doHyperlink(org.eclipse.jface.text.IRegion)
@@ -249,4 +247,11 @@
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see IHyperlink#getHyperlinkText()
+ */
+ abstract public String getHyperlinkText();
+
}
Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/LinkHyperlink.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/LinkHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076)
+++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/LinkHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077)
@@ -11,23 +11,22 @@
package org.jboss.tools.common.text.ext.hyperlink;
import java.io.FileNotFoundException;
+import java.text.MessageFormat;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.jface.text.IRegion;
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.ide.IDE;
+import org.jboss.tools.common.text.ext.ExtensionsPlugin;
+import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages;
+import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
+import org.jboss.tools.common.text.ext.util.Utils;
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.Text;
-import org.jboss.tools.common.text.ext.ExtensionsPlugin;
-import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink;
-import org.jboss.tools.common.text.ext.hyperlink.HyperlinkRegion;
-import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
-import org.jboss.tools.common.text.ext.util.Utils;
-
/**
* @author Jeremy
*/
@@ -67,12 +66,13 @@
return filename;
}
+ IRegion fLastRegion = null;
/**
* @see com.ibm.sse.editor.AbstractHyperlink#doGetHyperlinkRegion(int)
*/
protected IRegion doGetHyperlinkRegion(int offset) {
- IRegion region = getRegion(offset);
- return region;
+ fLastRegion = getRegion(offset);
+ return fLastRegion;
}
protected IRegion getRegion(int offset) {
@@ -137,4 +137,17 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see IHyperlink#getHyperlinkText()
+ */
+ public String getHyperlinkText() {
+ String filePath = getFilePath(fLastRegion);
+ if (filePath == null)
+ return MessageFormat.format(Messages.OpenA, Messages.File);
+
+ return MessageFormat.format(Messages.OpenFile, filePath);
+ }
+
}
Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/RelativeLinkHyperlink.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/RelativeLinkHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076)
+++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/RelativeLinkHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077)
@@ -11,22 +11,22 @@
package org.jboss.tools.common.text.ext.hyperlink;
import java.io.FileNotFoundException;
+import java.text.MessageFormat;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.jface.text.IRegion;
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.ide.IDE;
+import org.jboss.tools.common.text.ext.ExtensionsPlugin;
+import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages;
+import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
+import org.jboss.tools.common.text.ext.util.Utils;
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.Text;
-import org.jboss.tools.common.text.ext.ExtensionsPlugin;
-import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink;
-import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
-import org.jboss.tools.common.text.ext.util.Utils;
-
/**
* @author Jeremy
*/
@@ -78,11 +78,13 @@
}
}
+ IRegion fLastRegion = null;
/**
* @see com.ibm.sse.editor.AbstractHyperlink#doGetHyperlinkRegion(int)
*/
protected IRegion doGetHyperlinkRegion(int offset) {
- return getRegion(offset);
+ fLastRegion = getRegion(offset);
+ return fLastRegion;
}
protected IRegion getRegion(int offset) {
@@ -159,4 +161,17 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see IHyperlink#getHyperlinkText()
+ */
+ public String getHyperlinkText() {
+ String filePath = getFilePath(fLastRegion);
+ if (filePath == null)
+ return MessageFormat.format(Messages.OpenA, Messages.File);
+
+ return MessageFormat.format(Messages.OpenFile, filePath);
+ }
+
}
\ No newline at end of file
Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/RoleNameHyperlink.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/RoleNameHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076)
+++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/RoleNameHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077)
@@ -10,7 +10,9 @@
******************************************************************************/
package org.jboss.tools.common.text.ext.hyperlink;
+import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages;
+
/**
* @author Jeremy
*
@@ -21,4 +23,14 @@
protected String getDestinationAxis() {
return "/web-app/security-role/role-name/";
}
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see IHyperlink#getHyperlinkText()
+ */
+ public String getHyperlinkText() {
+ return Messages.BrowseToRoleNameDefinition;
+ }
+
}
Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/ServletNameHyperlink.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/ServletNameHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076)
+++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/ServletNameHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077)
@@ -10,7 +10,9 @@
******************************************************************************/
package org.jboss.tools.common.text.ext.hyperlink;
+import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages;
+
/**
* @author Jeremy
*
@@ -21,4 +23,14 @@
protected String getDestinationAxis() {
return "/web-app/servlet/servlet-name/";
}
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see IHyperlink#getHyperlinkText()
+ */
+ public String getHyperlinkText() {
+ return Messages.BrowseToServletNameDefinition;
+ }
+
}
Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/TLDAttributeNameHyperlink.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/TLDAttributeNameHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076)
+++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/TLDAttributeNameHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077)
@@ -15,14 +15,14 @@
import java.util.StringTokenizer;
import org.eclipse.jface.text.IRegion;
+import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages;
+import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
+import org.jboss.tools.common.text.ext.util.Utils;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
-import org.jboss.tools.common.text.ext.util.Utils;
-
/**
* @author Jeremy
*
@@ -86,4 +86,13 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see IHyperlink#getHyperlinkText()
+ */
+ public String getHyperlinkText() {
+ return Messages.BrowseToTLDAttributeNameDeclaration;
+ }
+
}
Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/XModelBasedHyperlink.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/XModelBasedHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076)
+++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/XModelBasedHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077)
@@ -15,17 +15,15 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.jface.text.IRegion;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.w3c.dom.Text;
-
import org.jboss.tools.common.model.XModel;
import org.jboss.tools.common.model.project.IPromptingProvider;
import org.jboss.tools.common.model.project.PromptingProviderFactory;
-import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink;
import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
import org.jboss.tools.common.text.ext.util.Utils;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import org.w3c.dom.Text;
/**
* @author Jeremy
@@ -64,15 +62,13 @@
protected abstract Properties getRequestProperties(IRegion region);
+ protected IRegion fLastRegion = null;
/**
* @see com.ibm.sse.editor.AbstractHyperlink#doGetHyperlinkRegion(int)
*/
protected IRegion doGetHyperlinkRegion(int offset) {
- try {
- return getRegion(offset);
- } catch (Exception x) {
- return null;
- }
+ fLastRegion = getRegion(offset);
+ return fLastRegion;
}
protected IRegion getRegion (int offset) {
Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/jsp/JSPBeanGetPropertyHyperlink.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/jsp/JSPBeanGetPropertyHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076)
+++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/jsp/JSPBeanGetPropertyHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077)
@@ -10,21 +10,23 @@
******************************************************************************/
package org.jboss.tools.common.text.ext.hyperlink.jsp;
+import java.text.MessageFormat;
+
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.ui.JavaUI;
import org.eclipse.jface.text.IRegion;
import org.eclipse.ui.IEditorPart;
+import org.jboss.tools.common.text.ext.ExtensionsPlugin;
+import org.jboss.tools.common.text.ext.hyperlink.ClassMethodHyperlink;
+import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages;
+import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
+import org.jboss.tools.common.text.ext.util.Utils;
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-import org.jboss.tools.common.text.ext.ExtensionsPlugin;
-import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
-import org.jboss.tools.common.text.ext.util.Utils;
-import org.jboss.tools.common.text.ext.hyperlink.ClassMethodHyperlink;
-
/**
* @author Jeremy
*
@@ -193,4 +195,17 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see IHyperlink#getHyperlinkText()
+ */
+ public String getHyperlinkText() {
+ String propertyName = getPropertyName(fLastRegion);
+ if (propertyName == null)
+ return MessageFormat.format(Messages.OpenA, Messages.Getter);
+
+ return MessageFormat.format(Messages.OpenGetterOrSetterForProperty, Messages.Getter, propertyName);
+ }
+
}
Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/jsp/JSPBeanSetPropertyHyperlink.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/jsp/JSPBeanSetPropertyHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076)
+++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/jsp/JSPBeanSetPropertyHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077)
@@ -10,6 +10,10 @@
******************************************************************************/
package org.jboss.tools.common.text.ext.hyperlink.jsp;
+import java.text.MessageFormat;
+
+import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages;
+
/**
* @author Jeremy
*
@@ -22,4 +26,17 @@
return SET_METHOD_PREFIX;
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see IHyperlink#getHyperlinkText()
+ */
+ public String getHyperlinkText() {
+ String propertyName = getPropertyName(fLastRegion);
+ if (propertyName == null)
+ return MessageFormat.format(Messages.OpenA, Messages.Setter);
+
+ return MessageFormat.format(Messages.OpenGetterOrSetterForProperty, Messages.Setter, propertyName);
+ }
+
}
Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/jsp/JSPElementNameHyperlink.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/jsp/JSPElementNameHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076)
+++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/jsp/JSPElementNameHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077)
@@ -10,18 +10,18 @@
******************************************************************************/
package org.jboss.tools.common.text.ext.hyperlink.jsp;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jdt.internal.core.JarEntryFile;
-import org.eclipse.jdt.internal.ui.javaeditor.JarEntryEditorInput;
+import java.text.MessageFormat;
+
+import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IRegion;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IEditorPart;
-
import org.jboss.tools.common.model.XModel;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.util.FindObjectHelper;
import org.jboss.tools.common.text.ext.ExtensionsPlugin;
import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink;
+import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages;
import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
import org.jboss.tools.common.text.ext.util.TaglibManagerWrapper;
import org.jboss.tools.jst.web.tld.ITaglibMapping;
@@ -77,12 +77,10 @@
Document xmlDocument = smw.getDocument();
if (xmlDocument == null) return null;
- String nodeName = getDocument().get(region.getOffset(), region.getLength());
- if (nodeName.indexOf(":") == -1) return null;
- String nodePrefix = nodeName.substring(0, nodeName.indexOf(":"));
- if (nodePrefix == null || nodePrefix.length() == 0) return null;
+ String nodePrefix = getTagPrefix(region);
+ if (nodePrefix == null)
+ return null;
-
TaglibManagerWrapper tmw = new TaglibManagerWrapper();
tmw.init(getDocument(), region.getOffset());
if(!tmw.exists()) return null;
@@ -109,12 +107,45 @@
}
}
+ private String getTagPrefix(IRegion region) {
+ if (region == null)
+ return null;
+
+ String nodeName;
+ try {
+ nodeName = getDocument().get(region.getOffset(), region.getLength());
+ } catch (BadLocationException e) {
+ ExtensionsPlugin.getPluginLog().logError(e);
+ return null;
+ }
+ if (nodeName.indexOf(":") != -1) {
+ String nodePrefix = nodeName.substring(0, nodeName.indexOf(":"));
+ if (nodePrefix != null && nodePrefix.length() > 0)
+ return nodePrefix;
+ }
+ return null;
+ }
+
+ IRegion fLastRegion = null;
/**
* @see com.ibm.sse.editor.AbstractHyperlink#doGetHyperlinkRegion(int)
*/
protected IRegion doGetHyperlinkRegion(int offset) {
- IRegion region = JSPElementNameHyperlinkPartitioner.getRegion(getDocument(), offset);
- return region;
+ fLastRegion = JSPElementNameHyperlinkPartitioner.getRegion(getDocument(), offset);
+ return fLastRegion;
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see IHyperlink#getHyperlinkText()
+ */
+ public String getHyperlinkText() {
+ String tagPrefix = getTagPrefix(fLastRegion);
+ if (tagPrefix == null)
+ return MessageFormat.format(Messages.OpenA, Messages.TagLibrary);
+
+ return MessageFormat.format(Messages.OpenTagLibraryForPrefix, tagPrefix);
+ }
+
}
Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/jsp/JSPForBeanIdHyperlink.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/jsp/JSPForBeanIdHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076)
+++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/jsp/JSPForBeanIdHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077)
@@ -10,8 +10,16 @@
******************************************************************************/
package org.jboss.tools.common.text.ext.hyperlink.jsp;
+import java.text.MessageFormat;
+
import org.eclipse.jface.text.IRegion;
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
+import org.jboss.tools.common.text.ext.ExtensionsPlugin;
+import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink;
+import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages;
+import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
+import org.jboss.tools.common.text.ext.util.StructuredSelectionHelper;
+import org.jboss.tools.common.text.ext.util.Utils;
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -19,12 +27,6 @@
import org.w3c.dom.NodeList;
import org.w3c.dom.Text;
-import org.jboss.tools.common.text.ext.ExtensionsPlugin;
-import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink;
-import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
-import org.jboss.tools.common.text.ext.util.StructuredSelectionHelper;
-import org.jboss.tools.common.text.ext.util.Utils;
-
/**
* @author Jeremy
*/
@@ -156,14 +158,15 @@
}
}
+ IRegion fLastRegion = null;
/*
* (non-Javadoc)
*
* @see com.ibm.sse.editor.AbstractHyperlink#doGetHyperlinkRegion(int)
*/
protected IRegion doGetHyperlinkRegion(int offset) {
- IRegion region = getRegion(offset);
- return region;
+ fLastRegion = getRegion(offset);
+ return fLastRegion;
}
private IRegion getRegion(int offset) {
@@ -237,4 +240,17 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see IHyperlink#getHyperlinkText()
+ */
+ public String getHyperlinkText() {
+ String forId = getForId(fLastRegion);
+ if (forId == null)
+ return MessageFormat.format(Messages.BrowseFor, Messages.BeanId);
+
+ return MessageFormat.format(Messages.BrowseForBeanId, forId);
+ }
+
}
Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/jsp/JSPTaglibHyperlink.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/jsp/JSPTaglibHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076)
+++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/jsp/JSPTaglibHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077)
@@ -10,9 +10,9 @@
******************************************************************************/
package org.jboss.tools.common.text.ext.hyperlink.jsp;
+import java.text.MessageFormat;
+
import org.eclipse.core.resources.IFile;
-import org.eclipse.jdt.internal.core.JarEntryFile;
-import org.eclipse.jdt.internal.ui.javaeditor.JarEntryEditorInput;
import org.eclipse.jface.text.IRegion;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IEditorPart;
@@ -21,20 +21,19 @@
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-
import org.jboss.tools.common.model.XModel;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.util.FindObjectHelper;
-import org.jboss.tools.common.text.ext.ExtensionsPlugin;
import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink;
+import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages;
import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
import org.jboss.tools.common.text.ext.util.Utils;
import org.jboss.tools.jst.web.tld.ITaglibMapping;
import org.jboss.tools.jst.web.tld.IWebProject;
import org.jboss.tools.jst.web.tld.WebProjectFactory;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
/**
* @author Jeremy
@@ -69,6 +68,20 @@
IFile file = getFile();
XModel xModel = getXModel(file);
if (xModel == null) return null;
+
+ String uri = getTaglibUri(region);
+ if (uri == null) return null;
+
+ IWebProject wp = WebProjectFactory.instance.getWebProject(xModel);
+ if (wp == null) return null;
+
+ ITaglibMapping tm = wp.getTaglibMapping();
+ if (tm == null) return null;
+
+ return tm.getTaglibObject(uri);
+ }
+
+ private String getTaglibUri(IRegion region) {
IStructuredModel model = null;
try {
model = getModelManager().getExistingModelForRead(getDocument());
@@ -85,26 +98,21 @@
String uri = taglib.getAttribute("uri");
if (uri == null || uri.trim().length() == 0) return null;
- IWebProject wp = WebProjectFactory.instance.getWebProject(xModel);
- if (wp == null) return null;
-
- ITaglibMapping tm = wp.getTaglibMapping();
- if (tm == null) return null;
- return tm.getTaglibObject(uri);
+ return uri;
} finally {
if (model != null) model.releaseFromRead();
}
}
-
+ IRegion fLastRegion = null;
/*
* (non-Javadoc)
*
* @seecom.ibm.sse.editor.AbstractHyperlink#doGetHyperlinkRegion(int)
*/
protected IRegion doGetHyperlinkRegion(int offset) {
- IRegion region = getRegion(offset);
- return region;
+ fLastRegion = getRegion(offset);
+ return fLastRegion;
}
private IRegion getRegion(int offset) {
@@ -147,6 +155,19 @@
} finally {
smw.dispose();
}
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see IHyperlink#getHyperlinkText()
+ */
+ public String getHyperlinkText() {
+ String uri = getTaglibUri(fLastRegion);
+ if (uri == null)
+ return MessageFormat.format(Messages.OpenA, Messages.TagLibrary);
+
+ return MessageFormat.format(Messages.OpenTagLibraryForUri, uri);
+ }
- }
}
\ No newline at end of file
Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/jsp/JSPXmlNsHyperlink.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/jsp/JSPXmlNsHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076)
+++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/jsp/JSPXmlNsHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077)
@@ -10,26 +10,28 @@
******************************************************************************/
package org.jboss.tools.common.text.ext.hyperlink.jsp;
+import java.text.MessageFormat;
+
import org.eclipse.core.resources.IFile;
import org.eclipse.jface.text.IRegion;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IEditorPart;
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMAttr;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
import org.jboss.tools.common.model.XModel;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.util.FindObjectHelper;
import org.jboss.tools.common.text.ext.ExtensionsPlugin;
import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink;
+import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages;
import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
import org.jboss.tools.common.text.ext.util.Utils;
import org.jboss.tools.jst.web.tld.ITaglibMapping;
import org.jboss.tools.jst.web.tld.IWebProject;
import org.jboss.tools.jst.web.tld.WebProjectFactory;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
/**
* @author Jeremy
@@ -104,14 +106,45 @@
smw.dispose();
}
}
-
+ private String getUri(IRegion region) {
+ IFile file = getFile();
+ XModel xModel = getXModel(file);
+ if (xModel == null) return null;
+
+ StructuredModelWrapper smw = new StructuredModelWrapper();
+ try {
+ smw.init(getDocument());
+ Document xmlDocument = smw.getDocument();
+ if (xmlDocument == null) return null;
+
+ Node n = Utils.findNodeForOffset(xmlDocument, region.getOffset());
+ if (!(n instanceof IDOMAttr)) return null;
+ Attr xmlnsAttr = (Attr)n;
+ if (xmlnsAttr.getName() == null || !xmlnsAttr.getName().startsWith("xmlns:")) return null;
+ Element rootElem = (Element)xmlnsAttr.getOwnerElement();
+ if (!(rootElem.getNodeName().equals("jsp:root") || rootElem.getNodeName().equalsIgnoreCase("html"))) return null;
+
+ String uri = xmlnsAttr.getValue();
+ if (uri == null || uri.trim().length() == 0) return null;
+
+ return uri;
+ } catch (Exception x) {
+ ExtensionsPlugin.getPluginLog().logError("Error in obtaining file name from region", x);
+ return null;
+ } finally {
+ smw.dispose();
+ }
+ }
+
+
+ IRegion fLastRegion = null;
/**
* @seecom.ibm.sse.editor.AbstractHyperlink#doGetHyperlinkRegion(int)
*/
protected IRegion doGetHyperlinkRegion(int offset) {
- IRegion region = getRegion(offset);
- return region;
+ fLastRegion = getRegion(offset);
+ return fLastRegion;
}
private IRegion getRegion(int offset) {
@@ -160,4 +193,17 @@
}
}
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see IHyperlink#getHyperlinkText()
+ */
+ public String getHyperlinkText() {
+ String uri = getUri(fLastRegion);
+ if (uri == null)
+ return MessageFormat.format(Messages.NotFound, "URI");
+
+ return MessageFormat.format(Messages.Open, uri);
+ }
}
\ No newline at end of file
Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xml/XMLElementAttributeValueHyperlinkPartitioner.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xml/XMLElementAttributeValueHyperlinkPartitioner.java 2008-07-04 12:19:57 UTC (rev 9076)
+++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xml/XMLElementAttributeValueHyperlinkPartitioner.java 2008-07-04 14:16:57 UTC (rev 9077)
@@ -11,10 +11,6 @@
package org.jboss.tools.common.text.ext.hyperlink.xml;
import org.eclipse.jface.text.IDocument;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-
import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlinkPartitioner;
import org.jboss.tools.common.text.ext.hyperlink.HyperlinkRegion;
import org.jboss.tools.common.text.ext.hyperlink.IExclusiblePartitionerRecognition;
@@ -22,6 +18,9 @@
import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkRegion;
import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
import org.jboss.tools.common.text.ext.util.Utils;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
/**
@@ -57,9 +56,6 @@
IHyperlinkRegion region = new HyperlinkRegion(offset, length, axis, contentType, type);
return region;
- } catch (Exception x) {
- //ignore
- return null;
} finally {
smw.dispose();
}
@@ -83,9 +79,6 @@
return false;
return true;
- } catch (Exception x) {
- //ignore
- return false;
} finally {
smw.dispose();
}
Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xml/XMLXmlNsHyperlink.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xml/XMLXmlNsHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076)
+++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xml/XMLXmlNsHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077)
@@ -15,6 +15,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
+import java.text.MessageFormat;
import java.util.StringTokenizer;
import java.util.zip.ZipFile;
@@ -41,6 +42,7 @@
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMAttr;
import org.jboss.tools.common.text.ext.ExtensionsPlugin;
import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink;
+import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages;
import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
import org.jboss.tools.common.text.ext.util.Utils;
import org.w3c.dom.Document;
@@ -127,9 +129,7 @@
return null;
}
}
-
-
/*
* (non-Javadoc)
*
@@ -314,12 +314,13 @@
return fileName;
}
+ IRegion fLastRegion = null;
/**
- * @seecom.ibm.sse.editor.AbstractHyperlink#doGetHyperlinkRegion(int)
+ * @see com.ibm.sse.editor.AbstractHyperlink#doGetHyperlinkRegion(int)
*/
protected IRegion doGetHyperlinkRegion(int offset) {
- IRegion region = getRegion(offset);
- return region;
+ fLastRegion = getRegion(offset);
+ return fLastRegion;
}
protected IRegion getRegion(int offset) {
@@ -394,4 +395,18 @@
}
}
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see IHyperlink#getHyperlinkText()
+ */
+ public String getHyperlinkText() {
+ String uri = getURI(fLastRegion);
+ if (uri == null)
+ return MessageFormat.format(Messages.NotFound, "URI");
+
+ return MessageFormat.format(Messages.Open, uri);
+ }
+
}
Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xpl/AbstractBaseHyperlink.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xpl/AbstractBaseHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076)
+++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xpl/AbstractBaseHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077)
@@ -19,7 +19,6 @@
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Status;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.IRegion;
@@ -300,9 +299,11 @@
*
* @see IHyperlink#getHyperlinkText()
*/
- public String getHyperlinkText() {
- return null;
- }
+// public String getHyperlinkText() {
+// return null;
+// }
+
+ abstract public String getHyperlinkText();
/*
* (non-Javadoc)
Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xpl/Messages.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xpl/Messages.java 2008-07-04 12:19:57 UTC (rev 9076)
+++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xpl/Messages.java 2008-07-04 14:16:57 UTC (rev 9077)
@@ -26,5 +26,40 @@
Messages.class);
}
- public static String cannotOpenLink;
+ public static String cannotOpenLink;
+
+ public static String NotFound;
+ public static String Open;
+ public static String OpenA;
+ public static String OpenAn;
+ public static String BrowseFor;
+ public static String OpenFile;
+ public static String OpenGetterOrSetterForProperty;
+ public static String OpenValidationMethod;
+ public static String OpenBean;
+ public static String OpenClass;
+ public static String OpenBundle;
+ public static String OpenBundleProperty;
+ public static String OpenCSSStyle;
+ public static String OpenTagLibraryForPrefix;
+ public static String OpenTagLibraryForUri;
+ public static String TagLibrary;
+ public static String File;
+ public static String Getter;
+ public static String Setter;
+ public static String Bean;
+ public static String Class;
+ public static String Bundle;
+ public static String BundleProperty;
+ public static String CSSStyle;
+ public static String ValidationMethod;
+ public static String BrowseToFilterNameDefinition;
+ public static String BrowseToRoleNameDefinition;
+ public static String BrowseToServletNameDefinition;
+ public static String BrowseToTLDAttributeNameDeclaration;
+ public static String BrowseForId;
+ public static String Id;
+ public static String BrowseForBeanId;
+ public static String BeanId;
+
}
Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xpl/Messages.properties
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xpl/Messages.properties 2008-07-04 12:19:57 UTC (rev 9076)
+++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xpl/Messages.properties 2008-07-04 14:16:57 UTC (rev 9077)
@@ -12,4 +12,38 @@
# Red Hat, Inc.
# ******************************************************************************
-cannotOpenLink=Current text selection does not resolve to a file
\ No newline at end of file
+cannotOpenLink=Current text selection does not resolve to a file
+
+BrowseToFilterNameDefinition=Browse to ''filter-name'' definition
+BrowseToRoleNameDefinition=Browse to ''role-name'' definition
+BrowseToServletNameDefinition=Browse to ''servlet-name'' definition
+BrowseToFilterNameDefinition=Browse to TLD Attribute Name declaration
+Open=Open ''{0}''
+OpenA=Open a {0}
+OpenAn=Open an {0}
+BrowseFor=Browse for {0}
+OpenGetterOrSetterForProperty=Open a {0} for the property ''{1}''
+OpenValidationMethod=Open Validation Method ''{0}''
+OpenClass=Open class ''{0}''
+OpenBean=Open Bean ''{0}''
+OpenBundle=Open bundle for base name ''{0}''
+OpenBundleProperty=Open property ''{0}'' of bundle ''{1}''
+OpenCSSStyle=Open CSS style definition ''{0}''
+OpenFile=Open file ''{0}''
+Getter=getter
+Setter=setter
+Bean=bean
+Class=class
+Bundle=bundle
+BundleProperty=bundle property
+CSSStyle=CSS style
+ValidationMethod=Validation Method
+NotFound=''{0}'' not found
+File=file
+TagLibrary=Tag Library
+OpenTagLibraryForPrefix=Open a Tag Library for prefix ''{0}''
+OpenTagLibraryForUri=Open a Tag Library for URI ''{0}''
+BrowseForId=Browse for ID ''{0}''
+Id=ID
+BrowseForBeanId=Browse for Bean ID ''{0}''
+BeanId=Bean ID
Added: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/JSFTextExtMessages.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/JSFTextExtMessages.java (rev 0)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/JSFTextExtMessages.java 2008-07-04 14:16:57 UTC (rev 9077)
@@ -0,0 +1,45 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Exadel, Inc. and 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
+ *
+ * Contributors:
+ * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.jsf.text.ext;
+
+import org.eclipse.osgi.util.NLS;
+
+/**
+ * @author Jeremy
+ *
+ */
+
+public class JSFTextExtMessages {
+
+
+ private JSFTextExtMessages() { }
+
+ static {
+ NLS.initializeMessages(
+ "org.jboss.tools.jsf.text.ext.JSFTextExtMessages",
+ JSFTextExtMessages.class);
+ }
+
+ public static String Converter;
+ public static String OpenConverterForId;
+ public static String OpenTagLibrary;
+ public static String Tag;
+ public static String TagAttribute;
+ public static String ForTag;
+ public static String ForTagAttribute;
+ public static String NavigationRule;
+ public static String OpenBeanProperty;
+ public static String BeanProperty;
+ public static String RenderKit;
+ public static String OpenRenderKit;
+ public static String Validator;
+ public static String OpenValidatorForId;
+}
Added: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/JSFTextExtMessages.properties
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/JSFTextExtMessages.properties (rev 0)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/JSFTextExtMessages.properties 2008-07-04 14:16:57 UTC (rev 9077)
@@ -0,0 +1,25 @@
+# ******************************************************************************
+# Copyright (c) 2007 Exadel, Inc. and 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
+#
+# Contributors:
+# Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+# ******************************************************************************
+
+Converter=Converter
+OpenConverterForId=Open converter definition for ID ''{0}''
+OpenTagLibrary=Open a Tag Library for {0}
+Tag=a tag
+TagAttribute=an attribute
+ForTag=tag ''{0}''
+ForTagAttribute=attribute ''{0}'' of tag ''{1}''
+NavigationRule=Navigation Rule
+OpenBeanProperty=Open bean ''{0}'' for the property ''{1}''
+BeanProperty=Bean Property
+RenderKit=Render Kit
+OpenRenderKit=Open Render Kit ''{0}''
+Validator=validator
+OpenValidatorForId=Open a validator for ID ''{1}''
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/BeanHyperlink.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/BeanHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/BeanHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077)
@@ -10,10 +10,13 @@
******************************************************************************/
package org.jboss.tools.jsf.text.ext.hyperlink;
+import java.text.MessageFormat;
+
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IRegion;
import org.jboss.tools.common.model.XModel;
import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink;
+import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages;
import org.jboss.tools.jsf.text.ext.JSFExtensionsPlugin;
import org.jboss.tools.jst.web.project.list.WebPromptingProvider;
@@ -40,12 +43,41 @@
}
}
+ private String getBeanName(IRegion region) {
+ if (region == null)
+ return null;
+ IRegion regionPart = JSPBeanHyperlinkPartitioner.getRegionPart(getDocument(), region.getOffset());
+ if(regionPart == null)
+ return null;
+ try {
+ String beanName = getDocument().get(region.getOffset(), region.getLength());
+ return beanName;
+ } catch (BadLocationException x) {
+ JSFExtensionsPlugin.log("", x);
+ return null;
+ }
+ }
+
+ IRegion fLastRegion = null;
/**
* @see com.ibm.sse.editor.AbstractHyperlink#doGetHyperlinkRegion(int)
*/
protected IRegion doGetHyperlinkRegion(int offset) {
- IRegion region = JSPBeanHyperlinkPartitioner.getWordRegion(getDocument(), offset);
- return region;
+ fLastRegion = JSPBeanHyperlinkPartitioner.getWordRegion(getDocument(), offset);
+ return fLastRegion;
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see IHyperlink#getHyperlinkText()
+ */
+ public String getHyperlinkText() {
+ String beanName = getBeanName(fLastRegion);
+ if (beanName == null)
+ return MessageFormat.format(Messages.OpenA, Messages.Bean);
+
+ return MessageFormat.format(Messages.OpenBean, beanName);
+ }
+
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/BundleBasenameHyperlink.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/BundleBasenameHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/BundleBasenameHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077)
@@ -10,6 +10,7 @@
******************************************************************************/
package org.jboss.tools.jsf.text.ext.hyperlink;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.HashSet;
@@ -28,6 +29,7 @@
import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.common.model.util.XModelObjectLoaderUtil;
import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink;
+import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages;
import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
import org.jboss.tools.common.text.ext.util.Utils;
import org.jboss.tools.jsf.model.pv.JSFProjectsRoot;
@@ -268,11 +270,13 @@
}
+ IRegion fLastRegion = null;
/**
* @see com.ibm.sse.editor.AbstractHyperlink#doGetHyperlinkRegion(int)
*/
protected IRegion doGetHyperlinkRegion(int offset) {
- return getRegion(offset);
+ fLastRegion = getRegion(offset);
+ return fLastRegion;
}
private IRegion getRegion(int offset) {
@@ -345,4 +349,18 @@
smw.dispose();
}
}
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see IHyperlink#getHyperlinkText()
+ */
+ public String getHyperlinkText() {
+ String baseName = getBundleBasename(fLastRegion);
+ if (baseName == null)
+ return MessageFormat.format(Messages.OpenA, Messages.Bundle);
+
+ return MessageFormat.format(Messages.OpenBundle, baseName);
+ }
+
}
\ No newline at end of file
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/BundleHyperlink.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/BundleHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/BundleHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077)
@@ -10,27 +10,31 @@
******************************************************************************/
package org.jboss.tools.jsf.text.ext.hyperlink;
-import java.util.*;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IRegion;
import org.eclipse.ui.IEditorPart;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
import org.jboss.tools.common.model.XModel;
-import org.jboss.tools.jsf.text.ext.JSFExtensionsPlugin;
+import org.jboss.tools.common.text.ext.hyperlink.XModelBasedHyperlink;
+import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages;
import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
import org.jboss.tools.common.text.ext.util.TaglibManagerWrapper;
import org.jboss.tools.common.text.ext.util.Utils;
-import org.jboss.tools.common.text.ext.hyperlink.XModelBasedHyperlink;
+import org.jboss.tools.jsf.text.ext.JSFExtensionsPlugin;
import org.jboss.tools.jst.web.project.list.WebPromptingProvider;
import org.jboss.tools.jst.web.tld.TaglibData;
import org.jboss.tools.jst.web.tld.VpeTaglibManager;
import org.jboss.tools.jst.web.tld.VpeTaglibManagerProvider;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
/**
* @author Jeremy
@@ -195,12 +199,14 @@
}
}
+ IRegion fLastRegion = null;
+
/**
* @see com.ibm.sse.editor.AbstractHyperlink#doGetHyperlinkRegion(int)
*/
protected IRegion doGetHyperlinkRegion(int offset) {
- IRegion region = JSPBundleHyperlinkPartitioner.getRegion(getDocument(), offset);
- return region;
+ fLastRegion = JSPBundleHyperlinkPartitioner.getRegion(getDocument(), offset);
+ return fLastRegion;
}
protected String getRequestMethod() {
@@ -227,4 +233,18 @@
return p;
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see IHyperlink#getHyperlinkText()
+ */
+ public String getHyperlinkText() {
+ String baseName = getBundleBasename(fLastRegion);
+ String propertyName = getBundleProperty(fLastRegion);
+ if (baseName == null || propertyName == null)
+ return MessageFormat.format(Messages.OpenA, Messages.BundleProperty);
+
+ return MessageFormat.format(Messages.OpenBundleProperty, propertyName, baseName);
+ }
+
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/ConverterHyperlink.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/ConverterHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/ConverterHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077)
@@ -10,23 +10,25 @@
******************************************************************************/
package org.jboss.tools.jsf.text.ext.hyperlink;
+import java.text.MessageFormat;
import java.util.Properties;
import org.eclipse.core.resources.IFile;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IRegion;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.w3c.dom.Text;
-
import org.jboss.tools.common.model.XModel;
import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink;
+import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages;
import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
import org.jboss.tools.common.text.ext.util.Utils;
import org.jboss.tools.jsf.JSFModelPlugin;
import org.jboss.tools.jsf.text.ext.JSFExtensionsPlugin;
+import org.jboss.tools.jsf.text.ext.JSFTextExtMessages;
import org.jboss.tools.jst.web.project.list.WebPromptingProvider;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import org.w3c.dom.Text;
/**
* @author Jeremy
@@ -41,29 +43,36 @@
if (xModel == null) return;
WebPromptingProvider provider = WebPromptingProvider.getInstance();
Properties p = new Properties();
- region = getRegion(region.getOffset());
- String converterID = null;
- String error = null;
- if(getDocument() != null && region != null) try {
- converterID = getDocument().get(region.getOffset(), region.getLength());
- } catch (BadLocationException x) {
- JSFModelPlugin.getPluginLog().logError("Cannot get convertor id", x);
- }
+ String converterID = getConverterID(region);
IFile file = getFile();
if(file != null) p.put(WebPromptingProvider.FILE, file);
provider.getList(xModel, WebPromptingProvider.JSF_OPEN_CONVERTOR, converterID, p);
- error = p.getProperty(WebPromptingProvider.ERROR);
+ String error = p.getProperty(WebPromptingProvider.ERROR);
if ( error != null && error.length() > 0) {
openFileFailed();
}
}
+
+ private String getConverterID (IRegion region) {
+ IRegion localRegion = getRegion(region.getOffset());
+ String converterID = null;
+ if(getDocument() != null && region != null) {
+ try {
+ converterID = getDocument().get(region.getOffset(), region.getLength());
+ } catch (BadLocationException x) {
+ JSFModelPlugin.getPluginLog().logError("Cannot get convertor id", x);
+ }
+ }
+ return converterID;
+ }
+ IRegion fLastRegion = null;
/**
* @see com.ibm.sse.editor.AbstractHyperlink#doGetHyperlinkRegion(int)
*/
protected IRegion doGetHyperlinkRegion(int offset) {
- IRegion region = getRegion(offset);
- return region;
+ fLastRegion = getRegion(offset);
+ return fLastRegion;
}
private IRegion getRegion(int offset) {
@@ -137,4 +146,17 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see IHyperlink#getHyperlinkText()
+ */
+ public String getHyperlinkText() {
+ String converterId = getConverterID(fLastRegion);
+ if (converterId == null)
+ return MessageFormat.format(Messages.OpenA, JSFTextExtMessages.Converter);
+
+ return MessageFormat.format(JSFTextExtMessages.OpenConverterForId, converterId);
+ }
+
}
\ No newline at end of file
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/ForIDHyperlink.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/ForIDHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/ForIDHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077)
@@ -10,23 +10,24 @@
******************************************************************************/
package org.jboss.tools.jsf.text.ext.hyperlink;
+import java.text.MessageFormat;
+
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.IRegion;
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-
+import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink;
+import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages;
+import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
+import org.jboss.tools.common.text.ext.util.StructuredSelectionHelper;
+import org.jboss.tools.common.text.ext.util.Utils;
+import org.jboss.tools.jsf.text.ext.JSFExtensionsPlugin;
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.w3c.dom.Text;
-import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink;
-import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
-import org.jboss.tools.common.text.ext.util.StructuredSelectionHelper;
-import org.jboss.tools.common.text.ext.util.Utils;
-import org.jboss.tools.jsf.text.ext.JSFExtensionsPlugin;
-
/**
* @author Jeremy
*/
@@ -142,12 +143,13 @@
return sb.substring(bStart, bEnd);
}
+ IRegion fLastRegion = null;
/**
* @see com.ibm.sse.editor.AbstractHyperlink#doGetHyperlinkRegion(int)
*/
protected IRegion doGetHyperlinkRegion(int offset) {
- IRegion region = getRegion(offset);
- return region;
+ fLastRegion = getRegion(offset);
+ return fLastRegion;
}
private IRegion getRegion(int offset) {
@@ -221,4 +223,17 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see IHyperlink#getHyperlinkText()
+ */
+ public String getHyperlinkText() {
+ String forId = getForId(fLastRegion);
+ if (forId == null)
+ return MessageFormat.format(Messages.BrowseFor, Messages.Id);
+
+ return MessageFormat.format(Messages.BrowseForId, forId);
+ }
+
}
\ No newline at end of file
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/ForwardHyperlink.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/ForwardHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/ForwardHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077)
@@ -10,6 +10,7 @@
******************************************************************************/
package org.jboss.tools.jsf.text.ext.hyperlink;
+import java.text.MessageFormat;
import java.util.List;
import org.eclipse.core.resources.IFile;
@@ -18,9 +19,9 @@
import org.eclipse.jface.text.IRegion;
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.ide.IDE;
-
import org.jboss.tools.common.model.XModel;
import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink;
+import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages;
import org.jboss.tools.jsf.text.ext.JSFExtensionsPlugin;
import org.jboss.tools.jst.web.project.list.WebPromptingProvider;
@@ -74,13 +75,26 @@
return super.getFileFromProject(fileName);
}
-
+ IRegion fLastRegion = null;
/**
* @see com.ibm.sse.editor.AbstractHyperlink#doGetHyperlinkRegion(int)
*/
protected IRegion doGetHyperlinkRegion(int offset) {
- IRegion region = JSPForwardHyperlinkPartitioner.getRegion(getDocument(), offset);
- return region;
+ fLastRegion = JSPForwardHyperlinkPartitioner.getRegion(getDocument(), offset);
+ return fLastRegion;
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see IHyperlink#getHyperlinkText()
+ */
+ public String getHyperlinkText() {
+ String filePath = getFilePath(fLastRegion);
+ if (filePath == null)
+ return MessageFormat.format(Messages.OpenA, Messages.File);
+
+ return MessageFormat.format(Messages.OpenFile, filePath);
+ }
+
}
\ No newline at end of file
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPTagAttributeHyperlink.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPTagAttributeHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPTagAttributeHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077)
@@ -10,25 +10,26 @@
******************************************************************************/
package org.jboss.tools.jsf.text.ext.hyperlink;
+import java.text.MessageFormat;
import java.util.List;
import java.util.Properties;
import org.eclipse.core.resources.IFile;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IRegion;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.Text;
-
import org.jboss.tools.common.model.XModel;
import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink;
import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
import org.jboss.tools.common.text.ext.util.TaglibManagerWrapper;
import org.jboss.tools.common.text.ext.util.Utils;
import org.jboss.tools.jsf.text.ext.JSFExtensionsPlugin;
+import org.jboss.tools.jsf.text.ext.JSFTextExtMessages;
import org.jboss.tools.jst.web.project.list.WebPromptingProvider;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.Text;
/**
* @author Jeremy
@@ -136,11 +137,13 @@
}
}
+ IRegion fLastRegion = null;
/**
* @see com.ibm.sse.editor.AbstractHyperlink#doGetHyperlinkRegion(int)
*/
protected IRegion doGetHyperlinkRegion(int offset) {
- return getRegion(offset);
+ fLastRegion = getRegion(offset);
+ return fLastRegion;
}
private String getTagAttributeName(IRegion region) {
@@ -225,4 +228,20 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see IHyperlink#getHyperlinkText()
+ */
+ public String getHyperlinkText() {
+ String tagName = getTagName(fLastRegion);
+ String attrName = getTagAttributeName(fLastRegion);
+ if (tagName == null || attrName == null)
+ return MessageFormat.format(JSFTextExtMessages.OpenTagLibrary, JSFTextExtMessages.TagAttribute);
+
+ String tagAttr = MessageFormat.format(JSFTextExtMessages.ForTagAttribute, attrName, tagName);
+
+ return MessageFormat.format(JSFTextExtMessages.OpenTagLibrary, tagAttr);
+ }
+
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPTagNameHyperlink.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPTagNameHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPTagNameHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077)
@@ -10,27 +10,24 @@
******************************************************************************/
package org.jboss.tools.jsf.text.ext.hyperlink;
+import java.text.MessageFormat;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.IRegion;
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
import org.jboss.tools.common.model.XModel;
import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink;
+import org.jboss.tools.common.text.ext.hyperlink.jsp.JSPRootHyperlinkPartitioner;
import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
import org.jboss.tools.common.text.ext.util.Utils;
-import org.jboss.tools.common.text.ext.hyperlink.jsp.JSPRootHyperlinkPartitioner;
-import org.jboss.tools.jsf.text.ext.JSFExtensionsPlugin;
+import org.jboss.tools.jsf.text.ext.JSFTextExtMessages;
import org.jboss.tools.jst.web.project.list.WebPromptingProvider;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
/**
* @author Jeremy
@@ -126,11 +123,13 @@
}
}
+ IRegion fLastRegion = null;
/**
* @see com.ibm.sse.editor.AbstractHyperlink#doGetHyperlinkRegion(int)
*/
protected IRegion doGetHyperlinkRegion(int offset) {
- return getRegion(offset);
+ fLastRegion = getRegion(offset);
+ return fLastRegion;
}
protected IRegion getRegion (int offset) {
@@ -182,4 +181,19 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see IHyperlink#getHyperlinkText()
+ */
+ public String getHyperlinkText() {
+ String tagName = getTagName(fLastRegion);
+ if (tagName == null)
+ return MessageFormat.format(JSFTextExtMessages.OpenTagLibrary, JSFTextExtMessages.Tag);
+
+ String tag = MessageFormat.format(JSFTextExtMessages.ForTag, tagName);
+
+ return MessageFormat.format(JSFTextExtMessages.OpenTagLibrary, tag);
+ }
+
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPXmlNsHyperlink.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPXmlNsHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPXmlNsHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077)
@@ -10,25 +10,24 @@
******************************************************************************/
package org.jboss.tools.jsf.text.ext.hyperlink;
+import java.text.MessageFormat;
import java.util.Properties;
import org.eclipse.core.resources.IFile;
import org.eclipse.jface.text.IRegion;
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMAttr;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
import org.jboss.tools.common.model.XModel;
+import org.jboss.tools.common.text.ext.hyperlink.XModelBasedHyperlink;
+import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages;
import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
import org.jboss.tools.common.text.ext.util.Utils;
-import org.jboss.tools.common.text.ext.hyperlink.XModelBasedHyperlink;
-import org.jboss.tools.jsf.text.ext.JSFExtensionsPlugin;
import org.jboss.tools.jst.web.project.WebProject;
import org.jboss.tools.jst.web.project.list.WebPromptingProvider;
import org.jboss.tools.jst.web.tld.TaglibMapping;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
public class JsfJSPXmlNsHyperlink extends XModelBasedHyperlink {
@@ -36,8 +35,7 @@
return WebPromptingProvider.JSF_OPEN_TAG_LIBRARY;
}
- protected Properties getRequestProperties(IRegion region) {
- Properties p = new Properties();
+ private String getUri(IRegion region) {
StructuredModelWrapper smw = new StructuredModelWrapper();
smw.init(getDocument());
try {
@@ -62,8 +60,7 @@
String prefix = name.substring(name.indexOf(':') + 1);
String uri = Utils.trimQuotes(attr.getValue());
if (prefix != null && prefix.trim().length() > 0) {
- p.setProperty("prefix", tm.resolveURI(uri));
-
+ return tm.resolveURI(uri);
}
}
}
@@ -71,6 +68,17 @@
smw.dispose();
}
+ return null;
+ }
+
+ protected Properties getRequestProperties(IRegion region) {
+ Properties p = new Properties();
+
+ String uri = getUri(region);
+ if (uri != null && uri.trim().length() > 0) {
+ p.setProperty("prefix", uri);
+ }
+
return p;
}
@@ -118,4 +126,16 @@
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see IHyperlink#getHyperlinkText()
+ */
+ public String getHyperlinkText() {
+ String uri = getUri(fLastRegion);
+ if (uri == null)
+ return MessageFormat.format(Messages.NotFound, "URI");
+
+ return MessageFormat.format(Messages.Open, uri);
+ }
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfTaglibDirectiveHyperlink.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfTaglibDirectiveHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfTaglibDirectiveHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077)
@@ -10,18 +10,19 @@
******************************************************************************/
package org.jboss.tools.jsf.text.ext.hyperlink;
+import java.text.MessageFormat;
import java.util.Properties;
import org.eclipse.jface.text.IRegion;
+import org.jboss.tools.common.text.ext.hyperlink.XModelBasedHyperlink;
+import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages;
+import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
+import org.jboss.tools.common.text.ext.util.Utils;
+import org.jboss.tools.jst.web.project.list.WebPromptingProvider;
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
-import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
-import org.jboss.tools.common.text.ext.util.Utils;
-import org.jboss.tools.common.text.ext.hyperlink.XModelBasedHyperlink;
-import org.jboss.tools.jst.web.project.list.WebPromptingProvider;
-
/**
* @author Jeremy
*
@@ -32,8 +33,7 @@
return WebPromptingProvider.JSF_OPEN_TAG_LIBRARY;
}
- protected Properties getRequestProperties(IRegion region) {
- Properties p = new Properties();
+ private String getTaglibUri(IRegion region) {
StructuredModelWrapper smw = new StructuredModelWrapper();
smw.init(getDocument());
try {
@@ -49,12 +49,22 @@
String uri = Utils.getAttributeValue(getDocument(), node, "uri");
if (uri != null) {
- p.setProperty("prefix", uri);
+ return uri;
}
} finally {
smw.dispose();
}
+ return null;
+ }
+
+ protected Properties getRequestProperties(IRegion region) {
+ Properties p = new Properties();
+
+ String uri = getTaglibUri(region);
+ if (uri != null) {
+ p.setProperty("prefix", uri);
+ }
return p;
}
@@ -104,4 +114,17 @@
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see IHyperlink#getHyperlinkText()
+ */
+ public String getHyperlinkText() {
+ String uri = getTaglibUri(fLastRegion);
+ if (uri == null)
+ return MessageFormat.format(Messages.OpenA, Messages.TagLibrary);
+
+ return MessageFormat.format(Messages.OpenTagLibraryForUri, uri);
+ }
+
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/LoadBundleHyperlink.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/LoadBundleHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/LoadBundleHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077)
@@ -10,20 +10,21 @@
******************************************************************************/
package org.jboss.tools.jsf.text.ext.hyperlink;
+import java.text.MessageFormat;
import java.util.Properties;
import org.eclipse.jface.text.IRegion;
+import org.jboss.tools.common.text.ext.hyperlink.XModelBasedHyperlink;
+import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages;
+import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
+import org.jboss.tools.common.text.ext.util.TaglibManagerWrapper;
+import org.jboss.tools.common.text.ext.util.Utils;
+import org.jboss.tools.jst.web.project.list.WebPromptingProvider;
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
-import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
-import org.jboss.tools.common.text.ext.util.TaglibManagerWrapper;
-import org.jboss.tools.common.text.ext.util.Utils;
-import org.jboss.tools.common.text.ext.hyperlink.XModelBasedHyperlink;
-import org.jboss.tools.jst.web.project.list.WebPromptingProvider;
-
/**
* @author Jeremy
*
@@ -120,4 +121,17 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see IHyperlink#getHyperlinkText()
+ */
+ public String getHyperlinkText() {
+ String baseName = getBundleBasename(fLastRegion);
+ if (baseName == null)
+ return MessageFormat.format(Messages.OpenA, Messages.Bundle);
+
+ return MessageFormat.format(Messages.OpenBundle, baseName);
+ }
+
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/NavigationCaseHyperlink.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/NavigationCaseHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/NavigationCaseHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077)
@@ -10,6 +10,7 @@
******************************************************************************/
package org.jboss.tools.jsf.text.ext.hyperlink;
+import java.text.MessageFormat;
import java.util.Properties;
import org.eclipse.core.resources.IFile;
@@ -17,7 +18,9 @@
import org.eclipse.jface.text.IRegion;
import org.jboss.tools.common.model.XModel;
import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink;
+import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages;
import org.jboss.tools.jsf.text.ext.JSFExtensionsPlugin;
+import org.jboss.tools.jsf.text.ext.JSFTextExtMessages;
import org.jboss.tools.jst.web.project.list.WebPromptingProvider;
/**
@@ -46,13 +49,23 @@
JSFExtensionsPlugin.log("", x);
}
}
-
+
+ IRegion fLastRegion = null;
/**
* @see com.ibm.sse.editor.AbstractHyperlink#doGetHyperlinkRegion(int)
*/
protected IRegion doGetHyperlinkRegion(int offset) {
- IRegion region = JSPNavigationCaseHyperlinkPartitioner.getRegion(getDocument(), offset);
- return region;
+ fLastRegion = JSPNavigationCaseHyperlinkPartitioner.getRegion(getDocument(), offset);
+ return fLastRegion;
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see IHyperlink#getHyperlinkText()
+ */
+ public String getHyperlinkText() {
+ return MessageFormat.format(Messages.BrowseFor, JSFTextExtMessages.NavigationRule);
+ }
+
}
\ No newline at end of file
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/PropertyHyperlink.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/PropertyHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/PropertyHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077)
@@ -10,10 +10,19 @@
******************************************************************************/
package org.jboss.tools.jsf.text.ext.hyperlink;
+import java.text.MessageFormat;
import java.util.Properties;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IRegion;
+import org.jboss.tools.common.model.XModel;
+import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink;
+import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages;
+import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
+import org.jboss.tools.common.text.ext.util.Utils;
+import org.jboss.tools.jsf.text.ext.JSFExtensionsPlugin;
+import org.jboss.tools.jsf.text.ext.JSFTextExtMessages;
+import org.jboss.tools.jst.web.project.list.WebPromptingProvider;
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -21,13 +30,6 @@
import org.w3c.dom.NodeList;
import org.w3c.dom.Text;
-import org.jboss.tools.common.model.XModel;
-import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink;
-import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
-import org.jboss.tools.common.text.ext.util.Utils;
-import org.jboss.tools.jsf.text.ext.JSFExtensionsPlugin;
-import org.jboss.tools.jst.web.project.list.WebPromptingProvider;
-
/**
* @author Jeremy
*/
@@ -56,11 +58,13 @@
}
}
+ IRegion fLastRegion = null;
/**
* @see com.ibm.sse.editor.AbstractHyperlink#doGetHyperlinkRegion(int)
*/
protected IRegion doGetHyperlinkRegion(int offset) {
- return getRegion(offset);
+ fLastRegion = getRegion(offset);
+ return fLastRegion;
}
private String getPropertyName(IRegion region) {
@@ -213,4 +217,18 @@
return sb.substring(bStart, bEnd);
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see IHyperlink#getHyperlinkText()
+ */
+ public String getHyperlinkText() {
+ String beanClassName = getBeanClassName(fLastRegion);
+ String propertyName = getPropertyName(fLastRegion);
+ if (beanClassName == null || propertyName == null)
+ return MessageFormat.format(Messages.OpenA, JSFTextExtMessages.BeanProperty);
+
+ return MessageFormat.format(JSFTextExtMessages.OpenBeanProperty, beanClassName, propertyName);
+ }
+
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/RenderKitHyperlink.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/RenderKitHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/RenderKitHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077)
@@ -10,21 +10,23 @@
******************************************************************************/
package org.jboss.tools.jsf.text.ext.hyperlink;
+import java.text.MessageFormat;
import java.util.Properties;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IRegion;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.w3c.dom.Text;
-
import org.jboss.tools.common.model.XModel;
import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink;
+import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages;
import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
import org.jboss.tools.common.text.ext.util.Utils;
import org.jboss.tools.jsf.text.ext.JSFExtensionsPlugin;
+import org.jboss.tools.jsf.text.ext.JSFTextExtMessages;
import org.jboss.tools.jst.web.project.list.WebPromptingProvider;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import org.w3c.dom.Text;
/**
* @author Jeremy
@@ -38,29 +40,35 @@
if(getDocument() == null || region == null) return;
XModel xModel = getXModel();
if (xModel == null) return;
- try {
- WebPromptingProvider provider = WebPromptingProvider.getInstance();
+ WebPromptingProvider provider = WebPromptingProvider.getInstance();
- IRegion r = getRegion(region.getOffset());
- String beanName = trimQuotes(getDocument().get(r.getOffset(), r.getLength()));
+ String beanName = getBeanName(getRegion(region.getOffset()));
- Properties p = new Properties();
- provider.getList(xModel, WebPromptingProvider.JSF_OPEN_RENDER_KIT, beanName, p);
- String error = p.getProperty(WebPromptingProvider.ERROR);
- if ( error != null && error.length() > 0) {
- openFileFailed();
- }
-
- } catch (BadLocationException x) {
+ Properties p = new Properties();
+ provider.getList(xModel, WebPromptingProvider.JSF_OPEN_RENDER_KIT, beanName, p);
+ String error = p.getProperty(WebPromptingProvider.ERROR);
+ if ( error != null && error.length() > 0) {
openFileFailed();
}
}
+
+ private String getBeanName(IRegion region) {
+ if(getDocument() == null || region == null) return null;
+ try {
+ return trimQuotes(getDocument().get(region.getOffset(), region.getLength()));
+ } catch (BadLocationException x) {
+ JSFExtensionsPlugin.log("", x);
+ return null;
+ }
+ }
+ IRegion fLastRegion = null;
/**
* @see com.ibm.sse.editor.AbstractHyperlink#doGetHyperlinkRegion(int)
*/
protected IRegion doGetHyperlinkRegion(int offset) {
- return getRegion(offset);
+ fLastRegion = getRegion(offset);
+ return fLastRegion;
}
private IRegion getRegion (int offset) {
@@ -153,5 +161,18 @@
bEnd++;
return sb.substring(bStart, bEnd);
}
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see IHyperlink#getHyperlinkText()
+ */
+ public String getHyperlinkText() {
+ String renderKitName = getBeanName(fLastRegion);
+ if (renderKitName == null)
+ return MessageFormat.format(Messages.OpenA, JSFTextExtMessages.RenderKit);
+
+ return MessageFormat.format(JSFTextExtMessages.OpenRenderKit, renderKitName);
+ }
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/ValidatorHyperlink.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/ValidatorHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/ValidatorHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077)
@@ -10,22 +10,24 @@
******************************************************************************/
package org.jboss.tools.jsf.text.ext.hyperlink;
+import java.text.MessageFormat;
import java.util.Properties;
import org.eclipse.core.resources.IFile;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IRegion;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.w3c.dom.Text;
-
import org.jboss.tools.common.model.XModel;
import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink;
+import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages;
import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
import org.jboss.tools.common.text.ext.util.Utils;
import org.jboss.tools.jsf.text.ext.JSFExtensionsPlugin;
+import org.jboss.tools.jsf.text.ext.JSFTextExtMessages;
import org.jboss.tools.jst.web.project.list.WebPromptingProvider;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import org.w3c.dom.Text;
/**
* @author Jeremy
@@ -42,28 +44,39 @@
if (xModel == null) return;
WebPromptingProvider provider = WebPromptingProvider.getInstance();
- try {
- region = getRegion(region.getOffset());
- if(region == null) return;
- String validatorID = getDocument().get(region.getOffset(), region.getLength());
- Properties p = new Properties();
- p.put(WebPromptingProvider.FILE, file);
- provider.getList(xModel, WebPromptingProvider.JSF_OPEN_VALIDATOR, validatorID, p);
- String error = p.getProperty(WebPromptingProvider.ERROR);
- if ( error != null && error.length() > 0) {
- openFileFailed();
- }
+
+ String validatorID = getValidatorId(getRegion(region.getOffset()));
+ if (validatorID == null) {
+ openFileFailed();
+ return;
+ }
+ Properties p = new Properties();
+ p.put(WebPromptingProvider.FILE, file);
+ provider.getList(xModel, WebPromptingProvider.JSF_OPEN_VALIDATOR, validatorID, p);
+ String error = p.getProperty(WebPromptingProvider.ERROR);
+ if ( error != null && error.length() > 0) {
+ openFileFailed();
+ }
+ }
+
+ private String getValidatorId(IRegion region) {
+ if(getDocument() == null || region == null) return null;
+ try {
+ return getDocument().get(region.getOffset(), region.getLength());
} catch (BadLocationException x) {
JSFExtensionsPlugin.log("", x);
+ return null;
}
}
+
+ IRegion fLastRegion = null;
/**
* @see com.ibm.sse.editor.AbstractHyperlink#doGetHyperlinkRegion(int)
*/
protected IRegion doGetHyperlinkRegion(int offset) {
- IRegion region = getRegion(offset);
- return region;
+ fLastRegion = getRegion(offset);
+ return fLastRegion;
}
private IRegion getRegion(int offset) {
@@ -137,4 +150,17 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see IHyperlink#getHyperlinkText()
+ */
+ public String getHyperlinkText() {
+ String validatorId = getValidatorId(fLastRegion);
+ if (validatorId == null)
+ return MessageFormat.format(Messages.OpenA, JSFTextExtMessages.Validator);
+
+ return MessageFormat.format(JSFTextExtMessages.OpenValidatorForId, validatorId);
+ }
+
}
\ No newline at end of file
Modified: trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamBeanHyperlink.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamBeanHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076)
+++ trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamBeanHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077)
@@ -10,14 +10,16 @@
******************************************************************************/
package org.jboss.tools.seam.text.ext.hyperlink;
+import java.text.MessageFormat;
import java.util.List;
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.ui.JavaUI;
+import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IRegion;
import org.eclipse.ui.IEditorPart;
import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink;
-import org.jboss.tools.seam.text.ext.SeamExtPlugin;
+import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages;
/**
* @author Jeremy
@@ -53,12 +55,32 @@
}
}
+ IRegion fLastRegion = null;
/**
* @see com.ibm.sse.editor.AbstractHyperlink#doGetHyperlinkRegion(int)
*/
protected IRegion doGetHyperlinkRegion(int offset) {
- IRegion region = SeamBeanHyperlinkPartitioner.getWordRegion(getDocument(), offset);
- return region;
+ fLastRegion = SeamBeanHyperlinkPartitioner.getWordRegion(getDocument(), offset);
+ return fLastRegion;
}
-
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see IHyperlink#getHyperlinkText()
+ */
+ public String getHyperlinkText() {
+
+ String beanName;
+ try {
+ beanName = getDocument().get(fLastRegion.getOffset(), fLastRegion.getLength());
+ } catch (BadLocationException e) {
+ beanName = null;
+ }
+
+ if (beanName == null)
+ return MessageFormat.format(Messages.NotFound, Messages.Bean);
+
+ return MessageFormat.format(Messages.OpenBean, beanName);
+ }
}
\ No newline at end of file
Modified: trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamELInJavaStringHyperlink.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamELInJavaStringHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076)
+++ trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamELInJavaStringHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077)
@@ -11,6 +11,8 @@
package org.jboss.tools.seam.text.ext.hyperlink;
+import java.text.MessageFormat;
+
import org.eclipse.core.runtime.Assert;
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.JavaModelException;
@@ -19,6 +21,7 @@
import org.eclipse.jface.text.hyperlink.IHyperlink;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.PartInitException;
+import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages;
import org.jboss.tools.seam.text.ext.SeamExtPlugin;
public class SeamELInJavaStringHyperlink implements IHyperlink {
@@ -77,10 +80,16 @@
}
/*
- * @see org.eclipse.jdt.internal.ui.javaeditor.IHyperlink#getHyperlinkText()
- * @since 3.1
+ * (non-Javadoc)
+ *
+ * @see IHyperlink#getHyperlinkText()
*/
public String getHyperlinkText() {
- return null;
+ if (fElements == null || fElements.length == 0)
+ return MessageFormat.format(Messages.OpenA, Messages.Bean);
+
+ return MessageFormat.format(Messages.Open, fElements[0].getElementName());
}
+
+
}
Added: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/StrutsTextExtMessages.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/StrutsTextExtMessages.java (rev 0)
+++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/StrutsTextExtMessages.java 2008-07-04 14:16:57 UTC (rev 9077)
@@ -0,0 +1,62 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Exadel, Inc. and 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
+ *
+ * Contributors:
+ * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.struts.text.ext;
+
+import org.eclipse.osgi.util.NLS;
+
+/**
+ * @author Jeremy
+ *
+ */
+
+public class StrutsTextExtMessages {
+
+
+ private StrutsTextExtMessages() { }
+
+ static {
+ NLS.initializeMessages(
+ "org.jboss.tools.struts.text.ext.StrutsTextExtMessages",
+ StrutsTextExtMessages.class);
+ }
+
+ public static String OpenTagLibrary;
+ public static String Tag;
+ public static String TagAttribute;
+ public static String ForTag;
+ public static String ForTagAttribute;
+ public static String OpenAction;
+ public static String Action;
+ public static String OpenActionMapping;
+ public static String ActionMapping;
+ public static String OpenFormBean;
+ public static String FormBean;
+ public static String OpenFormProperty;
+ public static String FormProperty;
+ public static String OpenForwardPath;
+ public static String ForwardPath;
+ public static String OpenPage;
+ public static String Page;
+ public static String OpenValidationBundle;
+ public static String ValidationBundle;
+ public static String OpenValidationBundleProperty;
+ public static String OpenValidationBundlePropertyForBundle;
+ public static String ValidationBundleProperty;
+ public static String OpenForward;
+ public static String Forward;
+ public static String OpenValidationProperty;
+ public static String ValidationProperty;
+ public static String OpenProperty;
+ public static String Property;
+ public static String OpenPropertyForFormAction;
+ public static String OpenValidator;
+ public static String Validator;
+}
Added: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/StrutsTextExtMessages.properties
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/StrutsTextExtMessages.properties (rev 0)
+++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/StrutsTextExtMessages.properties 2008-07-04 14:16:57 UTC (rev 9077)
@@ -0,0 +1,42 @@
+# ******************************************************************************
+# Copyright (c) 2007 Exadel, Inc. and 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
+#
+# Contributors:
+# Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+# ******************************************************************************
+
+OpenTagLibrary=Open a Tag Library for {0}
+Tag=a tag
+TagAttribute=an attribute
+ForTag=tag ''{0}''
+ForTagAttribute=attribute ''{0}'' of tag ''{1}''
+OpenAction=Open Action ''{0}''
+Action=Action
+OpenActionMapping=Open Action Mapping ''{0}''
+ActionMapping=Action Mapping
+OpenFormBean=Open Form Bean ''{0}''
+FormBean=Form Bean
+OpenFormProperty=Open Form Property ''{0}''
+FormProperty=Form Property
+OpenForwardPath=Open Forward Path ''{0}''
+ForwardPath=Forward Path
+OpenPage=Open Page ''{0}''
+Page=Page
+OpenValidationBundle=Open Validation Bundle ''{0}''
+ValidationBundle=Validation Bundle
+OpenValidationBundleProperty=Open Validation Bundle Property ''{0}''
+OpenValidationBundlePropertyForBundle=Open Property ''{0}'' of Validation Bundle ''{1}''
+ValidationBundleProperty=Validation Bundle Property
+OpenForward=Open Forward ''{0}''
+Forward=Forward
+OpenValidationProperty=Open Validation Property ''{0}'' for the form ''{1}''
+ValidationProperty=Validation Property
+OpenProperty=Open Property ''{0}''
+Property=Property
+OpenPropertyForFormAction=Open Property ''{0}'' for the form action ''{1}''
+OpenValidator=Open Validator ''{0}''
+Validator=Validator
Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsActionHyperlink.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsActionHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076)
+++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsActionHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077)
@@ -10,20 +10,22 @@
******************************************************************************/
package org.jboss.tools.struts.text.ext.hyperlink;
+import java.text.MessageFormat;
import java.util.Properties;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IRegion;
+import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages;
+import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
+import org.jboss.tools.common.text.ext.util.Utils;
+import org.jboss.tools.jst.web.project.list.WebPromptingProvider;
+import org.jboss.tools.struts.text.ext.StrutsExtensionsPlugin;
+import org.jboss.tools.struts.text.ext.StrutsTextExtMessages;
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
-import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
-import org.jboss.tools.common.text.ext.util.Utils;
-import org.jboss.tools.jst.web.project.list.WebPromptingProvider;
-import org.jboss.tools.struts.text.ext.StrutsExtensionsPlugin;
-
/**
* @author Jeremy
*
@@ -73,4 +75,17 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see IHyperlink#getHyperlinkText()
+ */
+ public String getHyperlinkText() {
+ String actionName = getAction(fLastRegion);
+ if (actionName == null)
+ return MessageFormat.format(Messages.OpenAn, StrutsTextExtMessages.Action);
+
+ return MessageFormat.format(StrutsTextExtMessages.OpenAction, actionName);
+ }
+
}
Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsActionMappingHyperlink.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsActionMappingHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076)
+++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsActionMappingHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077)
@@ -10,14 +10,16 @@
******************************************************************************/
package org.jboss.tools.struts.text.ext.hyperlink;
+import java.text.MessageFormat;
import java.util.Properties;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IRegion;
-
+import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages;
import org.jboss.tools.common.text.ext.util.Utils;
import org.jboss.tools.jst.web.project.list.WebPromptingProvider;
import org.jboss.tools.struts.text.ext.StrutsExtensionsPlugin;
+import org.jboss.tools.struts.text.ext.StrutsTextExtMessages;
/**
* @author Jeremy
@@ -46,4 +48,18 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see IHyperlink#getHyperlinkText()
+ */
+ public String getHyperlinkText() {
+ String actionName = getAction(fLastRegion);
+ if (actionName == null)
+ return MessageFormat.format(Messages.OpenAn, StrutsTextExtMessages.ActionMapping);
+
+ return MessageFormat.format(StrutsTextExtMessages.OpenActionMapping, actionName);
+ }
+
+
}
Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsBeanNameHyperlink.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsBeanNameHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076)
+++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsBeanNameHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077)
@@ -10,28 +10,29 @@
******************************************************************************/
package org.jboss.tools.struts.text.ext.hyperlink;
+import java.text.MessageFormat;
import java.util.Iterator;
import java.util.Map;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IRegion;
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Text;
-
import org.jboss.tools.common.model.XModel;
import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink;
+import org.jboss.tools.common.text.ext.hyperlink.jsp.JSPRootHyperlinkPartitioner;
+import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages;
import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
import org.jboss.tools.common.text.ext.util.StructuredSelectionHelper;
import org.jboss.tools.common.text.ext.util.Utils;
-import org.jboss.tools.common.text.ext.hyperlink.jsp.JSPRootHyperlinkPartitioner;
import org.jboss.tools.jst.web.project.WebProject;
import org.jboss.tools.jst.web.tld.TaglibMapping;
import org.jboss.tools.struts.text.ext.StrutsExtensionsPlugin;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.w3c.dom.Text;
/**
* @author Jeremy
@@ -184,12 +185,13 @@
}
}
+ IRegion fLastRegion = null;
/**
* @see com.ibm.sse.editor.AbstractHyperlink#doGetHyperlinkRegion(int)
*/
protected IRegion doGetHyperlinkRegion(int offset) {
- IRegion region = getRegion(offset);
- return region;
+ fLastRegion = getRegion(offset);
+ return fLastRegion;
}
private IRegion getRegion(int offset) {
@@ -283,4 +285,17 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see IHyperlink#getHyperlinkText()
+ */
+ public String getHyperlinkText() {
+ String forId = getForId(fLastRegion);
+ if (forId == null)
+ return MessageFormat.format(Messages.BrowseFor, Messages.BeanId);
+
+ return MessageFormat.format(Messages.BrowseForBeanId, forId);
+ }
+
}
\ No newline at end of file
Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsBundleHyperlink.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsBundleHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076)
+++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsBundleHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077)
@@ -10,11 +10,12 @@
******************************************************************************/
package org.jboss.tools.struts.text.ext.hyperlink;
+import java.text.MessageFormat;
import java.util.Properties;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IRegion;
-
+import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages;
import org.jboss.tools.common.text.ext.util.Utils;
import org.jboss.tools.jst.web.project.list.WebPromptingProvider;
import org.jboss.tools.struts.text.ext.StrutsExtensionsPlugin;
@@ -49,4 +50,17 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see IHyperlink#getHyperlinkText()
+ */
+ public String getHyperlinkText() {
+ String baseName = getBundle(fLastRegion);
+ if (baseName == null)
+ return MessageFormat.format(Messages.OpenA, Messages.Bundle);
+
+ return MessageFormat.format(Messages.OpenBundle, baseName);
+ }
+
}
Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsBundleKeyHyperlink.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsBundleKeyHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076)
+++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsBundleKeyHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077)
@@ -10,18 +10,19 @@
******************************************************************************/
package org.jboss.tools.struts.text.ext.hyperlink;
+import java.text.MessageFormat;
import java.util.Properties;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IRegion;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-
+import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages;
import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
import org.jboss.tools.common.text.ext.util.Utils;
import org.jboss.tools.jst.web.project.list.WebPromptingProvider;
import org.jboss.tools.struts.text.ext.StrutsExtensionsPlugin;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
/**
* @author Jeremy
@@ -79,4 +80,18 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see IHyperlink#getHyperlinkText()
+ */
+ public String getHyperlinkText() {
+ String baseName = getBundle(fLastRegion);
+ String propertyName = getKey(fLastRegion);
+ if (baseName == null || propertyName == null)
+ return MessageFormat.format(Messages.OpenA, Messages.BundleProperty);
+
+ return MessageFormat.format(Messages.OpenBundleProperty, propertyName, baseName);
+ }
+
}
Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsConfigBundleHyperlink.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsConfigBundleHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076)
+++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsConfigBundleHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077)
@@ -10,11 +10,12 @@
******************************************************************************/
package org.jboss.tools.struts.text.ext.hyperlink;
+import java.text.MessageFormat;
import java.util.Properties;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IRegion;
-
+import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages;
import org.jboss.tools.common.text.ext.util.Utils;
import org.jboss.tools.jst.web.project.list.WebPromptingProvider;
import org.jboss.tools.struts.text.ext.StrutsExtensionsPlugin;
@@ -51,4 +52,17 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see IHyperlink#getHyperlinkText()
+ */
+ public String getHyperlinkText() {
+ String baseName = getBundle(fLastRegion);
+ if (baseName == null)
+ return MessageFormat.format(Messages.OpenA, Messages.Bundle);
+
+ return MessageFormat.format(Messages.OpenBundle, baseName);
+ }
+
}
Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsConfigBundleKeyHyperlink.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsConfigBundleKeyHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076)
+++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsConfigBundleKeyHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077)
@@ -10,18 +10,19 @@
******************************************************************************/
package org.jboss.tools.struts.text.ext.hyperlink;
+import java.text.MessageFormat;
import java.util.Properties;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IRegion;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-
+import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages;
import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
import org.jboss.tools.common.text.ext.util.Utils;
import org.jboss.tools.jst.web.project.list.WebPromptingProvider;
import org.jboss.tools.struts.text.ext.StrutsExtensionsPlugin;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
/**
* @author Jeremy
@@ -78,4 +79,18 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see IHyperlink#getHyperlinkText()
+ */
+ public String getHyperlinkText() {
+ String baseName = getBundle(fLastRegion);
+ String propertyName = getKey(fLastRegion);
+ if (baseName == null || propertyName == null)
+ return MessageFormat.format(Messages.OpenA, Messages.BundleProperty);
+
+ return MessageFormat.format(Messages.OpenBundleProperty, propertyName, baseName);
+ }
+
}
Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsConfigFormBeanHyperlink.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsConfigFormBeanHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076)
+++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsConfigFormBeanHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077)
@@ -10,14 +10,16 @@
******************************************************************************/
package org.jboss.tools.struts.text.ext.hyperlink;
+import java.text.MessageFormat;
import java.util.Properties;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IRegion;
-
+import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages;
import org.jboss.tools.common.text.ext.util.Utils;
import org.jboss.tools.jst.web.project.list.WebPromptingProvider;
import org.jboss.tools.struts.text.ext.StrutsExtensionsPlugin;
+import org.jboss.tools.struts.text.ext.StrutsTextExtMessages;
/**
* @author Jeremy
@@ -53,4 +55,17 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see IHyperlink#getHyperlinkText()
+ */
+ public String getHyperlinkText() {
+ String formBeanName = getAttributeValue(fLastRegion);
+ if (formBeanName == null)
+ return MessageFormat.format(Messages.OpenA, StrutsTextExtMessages.FormBean);
+
+ return MessageFormat.format(StrutsTextExtMessages.OpenFormBean, formBeanName);
+ }
+
}
Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsConfigFormPropertyHyperlink.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsConfigFormPropertyHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076)
+++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsConfigFormPropertyHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077)
@@ -10,18 +10,20 @@
******************************************************************************/
package org.jboss.tools.struts.text.ext.hyperlink;
+import java.text.MessageFormat;
import java.util.Properties;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IRegion;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-
+import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages;
import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
import org.jboss.tools.common.text.ext.util.Utils;
import org.jboss.tools.jst.web.project.list.WebPromptingProvider;
import org.jboss.tools.struts.text.ext.StrutsExtensionsPlugin;
+import org.jboss.tools.struts.text.ext.StrutsTextExtMessages;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
/**
* @author Jeremy
@@ -77,4 +79,16 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see IHyperlink#getHyperlinkText()
+ */
+ public String getHyperlinkText() {
+ String formPropertyName = getName(fLastRegion);
+ if (formPropertyName == null)
+ return MessageFormat.format(Messages.OpenA, StrutsTextExtMessages.FormProperty);
+
+ return MessageFormat.format(StrutsTextExtMessages.OpenFormProperty, formPropertyName);
+ }
}
Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsConfigForwardPathHyperlink.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsConfigForwardPathHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076)
+++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsConfigForwardPathHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077)
@@ -10,18 +10,20 @@
******************************************************************************/
package org.jboss.tools.struts.text.ext.hyperlink;
+import java.text.MessageFormat;
import java.util.Properties;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IRegion;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-
+import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages;
import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
import org.jboss.tools.common.text.ext.util.Utils;
import org.jboss.tools.jst.web.project.list.WebPromptingProvider;
import org.jboss.tools.struts.text.ext.StrutsExtensionsPlugin;
+import org.jboss.tools.struts.text.ext.StrutsTextExtMessages;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
/**
* @author Jeremy
@@ -130,4 +132,17 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see IHyperlink#getHyperlinkText()
+ */
+ public String getHyperlinkText() {
+ String path = getPath(fLastRegion);
+ if (path == null)
+ return MessageFormat.format(Messages.OpenA, StrutsTextExtMessages.ForwardPath);
+
+ return MessageFormat.format(StrutsTextExtMessages.OpenForwardPath, path);
+ }
+
}
Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsConfigPageHyperlink.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsConfigPageHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076)
+++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsConfigPageHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077)
@@ -10,14 +10,16 @@
******************************************************************************/
package org.jboss.tools.struts.text.ext.hyperlink;
+import java.text.MessageFormat;
import java.util.Properties;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IRegion;
-
+import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages;
import org.jboss.tools.common.text.ext.util.Utils;
import org.jboss.tools.jst.web.project.list.WebPromptingProvider;
import org.jboss.tools.struts.text.ext.StrutsExtensionsPlugin;
+import org.jboss.tools.struts.text.ext.StrutsTextExtMessages;
/**
* @author Jeremy
@@ -48,4 +50,18 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see IHyperlink#getHyperlinkText()
+ */
+ public String getHyperlinkText() {
+ String page = getPage(fLastRegion);
+ if (page == null)
+ return MessageFormat.format(Messages.OpenA, StrutsTextExtMessages.Page);
+
+ return MessageFormat.format(StrutsTextExtMessages.OpenPage, page);
+ }
+
+
}
Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsConfigPluginSetPropertyHyperlink.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsConfigPluginSetPropertyHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076)
+++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsConfigPluginSetPropertyHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077)
@@ -10,19 +10,20 @@
******************************************************************************/
package org.jboss.tools.struts.text.ext.hyperlink;
+import java.text.MessageFormat;
import java.util.Properties;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IRegion;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-
import org.jboss.tools.common.text.ext.hyperlink.HyperlinkRegion;
+import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages;
import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
import org.jboss.tools.common.text.ext.util.Utils;
import org.jboss.tools.jst.web.project.list.WebPromptingProvider;
import org.jboss.tools.struts.text.ext.StrutsExtensionsPlugin;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
/**
* @author Jeremy
@@ -115,4 +116,18 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see IHyperlink#getHyperlinkText()
+ */
+ public String getHyperlinkText() {
+ String propertyName = getAttributeValue(fLastRegion);
+ if (propertyName == null)
+ return MessageFormat.format(Messages.OpenA, Messages.Setter);
+
+ return MessageFormat.format(Messages.OpenGetterOrSetterForProperty, Messages.Setter, propertyName);
+ }
+
+
}
Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsConfigSetPropertyHyperlink.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsConfigSetPropertyHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076)
+++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsConfigSetPropertyHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077)
@@ -10,15 +10,17 @@
******************************************************************************/
package org.jboss.tools.struts.text.ext.hyperlink;
+import java.text.MessageFormat;
+
import org.eclipse.jface.text.IRegion;
+import org.jboss.tools.common.text.ext.hyperlink.ClassMethodHyperlink;
+import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages;
+import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
+import org.jboss.tools.common.text.ext.util.Utils;
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
-import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
-import org.jboss.tools.common.text.ext.util.Utils;
-import org.jboss.tools.common.text.ext.hyperlink.ClassMethodHyperlink;
-
public class StrutsConfigSetPropertyHyperlink extends ClassMethodHyperlink {
private static final String CLASSNAME_ATTRNAME = "className";
private static final String PROPERTY_ATTRNAME = "property";
@@ -53,4 +55,18 @@
protected String getMethodParams(IRegion region) {
return null;
}
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see IHyperlink#getHyperlinkText()
+ */
+ public String getHyperlinkText() {
+ String propertyName = getAttributeValue(fLastRegion, PROPERTY_ATTRNAME);
+ if (propertyName == null)
+ return MessageFormat.format(Messages.OpenA, Messages.Setter);
+
+ return MessageFormat.format(Messages.OpenGetterOrSetterForProperty, Messages.Setter, propertyName);
+ }
+
}
Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsFormBeanHyperlink.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsFormBeanHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076)
+++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsFormBeanHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077)
@@ -10,14 +10,16 @@
******************************************************************************/
package org.jboss.tools.struts.text.ext.hyperlink;
+import java.text.MessageFormat;
import java.util.Properties;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IRegion;
-
+import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages;
import org.jboss.tools.common.text.ext.util.Utils;
import org.jboss.tools.jst.web.project.list.WebPromptingProvider;
import org.jboss.tools.struts.text.ext.StrutsExtensionsPlugin;
+import org.jboss.tools.struts.text.ext.StrutsTextExtMessages;
/**
* @author Jeremy
@@ -48,4 +50,16 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see IHyperlink#getHyperlinkText()
+ */
+ public String getHyperlinkText() {
+ String formBeanName = getFormBean(fLastRegion);
+ if (formBeanName == null)
+ return MessageFormat.format(Messages.OpenA, StrutsTextExtMessages.FormBean);
+
+ return MessageFormat.format(StrutsTextExtMessages.OpenFormBean, formBeanName);
+ }
}
Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsFormValidationBundleKeyHyperlink.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsFormValidationBundleKeyHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076)
+++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsFormValidationBundleKeyHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077)
@@ -10,14 +10,17 @@
******************************************************************************/
package org.jboss.tools.struts.text.ext.hyperlink;
+import java.text.MessageFormat;
import java.util.Properties;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IRegion;
+import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages;
import org.jboss.tools.common.text.ext.util.Utils;
import org.jboss.tools.jst.web.project.list.WebPromptingProvider;
import org.jboss.tools.struts.text.ext.StrutsExtensionsPlugin;
+import org.jboss.tools.struts.text.ext.StrutsTextExtMessages;
/**
@@ -54,4 +57,17 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see IHyperlink#getHyperlinkText()
+ */
+ public String getHyperlinkText() {
+ String propertyName = getKey(fLastRegion);
+ if (propertyName == null)
+ return MessageFormat.format(Messages.OpenA, StrutsTextExtMessages.ValidationBundleProperty);
+
+ return MessageFormat.format(StrutsTextExtMessages.OpenValidationBundleProperty, propertyName);
+ }
+
}
Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsForwardHyperlink.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsForwardHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076)
+++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsForwardHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077)
@@ -10,14 +10,16 @@
******************************************************************************/
package org.jboss.tools.struts.text.ext.hyperlink;
+import java.text.MessageFormat;
import java.util.Properties;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IRegion;
-
+import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages;
import org.jboss.tools.common.text.ext.util.Utils;
import org.jboss.tools.jst.web.project.list.WebPromptingProvider;
import org.jboss.tools.struts.text.ext.StrutsExtensionsPlugin;
+import org.jboss.tools.struts.text.ext.StrutsTextExtMessages;
/**
* @author Jeremy
@@ -48,4 +50,17 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see IHyperlink#getHyperlinkText()
+ */
+ public String getHyperlinkText() {
+ String forward = getForward(fLastRegion);
+ if (forward == null)
+ return MessageFormat.format(Messages.OpenA, StrutsTextExtMessages.Forward);
+
+ return MessageFormat.format(StrutsTextExtMessages.OpenForward, forward);
+ }
+
}
Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsJSPTagAttributeHyperlink.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsJSPTagAttributeHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076)
+++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsJSPTagAttributeHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077)
@@ -10,6 +10,7 @@
******************************************************************************/
package org.jboss.tools.struts.text.ext.hyperlink;
+import java.text.MessageFormat;
import java.util.List;
import java.util.Properties;
@@ -17,12 +18,6 @@
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.IRegion;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.Text;
-
import org.jboss.tools.common.model.XModel;
import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink;
import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
@@ -30,6 +25,12 @@
import org.jboss.tools.common.text.ext.util.Utils;
import org.jboss.tools.jst.web.project.list.WebPromptingProvider;
import org.jboss.tools.struts.text.ext.StrutsExtensionsPlugin;
+import org.jboss.tools.struts.text.ext.StrutsTextExtMessages;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.Text;
/**
* @author Jeremy
@@ -130,11 +131,13 @@
}
}
+ IRegion fLastRegion = null;
/**
* @see com.ibm.sse.editor.AbstractHyperlink#doGetHyperlinkRegion(int)
*/
protected IRegion doGetHyperlinkRegion(int offset) {
- return getRegion(offset);
+ fLastRegion = getRegion(offset);
+ return fLastRegion;
}
private String getTagAttributeName(IRegion region) {
@@ -229,4 +232,20 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see IHyperlink#getHyperlinkText()
+ */
+ public String getHyperlinkText() {
+ String tagName = getTagName(fLastRegion);
+ String attrName = getTagAttributeName(fLastRegion);
+ if (tagName == null || attrName == null)
+ return MessageFormat.format(StrutsTextExtMessages.OpenTagLibrary, StrutsTextExtMessages.TagAttribute);
+
+ String tagAttr = MessageFormat.format(StrutsTextExtMessages.ForTagAttribute, attrName, tagName);
+
+ return MessageFormat.format(StrutsTextExtMessages.OpenTagLibrary, tagAttr);
+ }
+
}
Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsJSPTagNameHyperlink.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsJSPTagNameHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076)
+++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsJSPTagNameHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077)
@@ -10,6 +10,7 @@
******************************************************************************/
package org.jboss.tools.struts.text.ext.hyperlink;
+import java.text.MessageFormat;
import java.util.List;
import java.util.Properties;
@@ -18,12 +19,6 @@
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.IRegion;
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
import org.jboss.tools.common.model.XModel;
import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink;
import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
@@ -31,6 +26,11 @@
import org.jboss.tools.common.text.ext.util.Utils;
import org.jboss.tools.jst.web.project.list.WebPromptingProvider;
import org.jboss.tools.struts.text.ext.StrutsExtensionsPlugin;
+import org.jboss.tools.struts.text.ext.StrutsTextExtMessages;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
/**
* @author Jeremy
@@ -128,11 +128,13 @@
}
}
+ IRegion fLastRegion = null;
/**
* @see com.ibm.sse.editor.AbstractHyperlink#doGetHyperlinkRegion(int)
*/
protected IRegion doGetHyperlinkRegion(int offset) {
- return getRegion(offset);
+ fLastRegion = getRegion(offset);
+ return fLastRegion;
}
protected IRegion getRegion (int offset) {
@@ -194,5 +196,20 @@
return null;
}
}
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see IHyperlink#getHyperlinkText()
+ */
+ public String getHyperlinkText() {
+ String tagName = getTagName(fLastRegion);
+ if (tagName == null)
+ return MessageFormat.format(StrutsTextExtMessages.OpenTagLibrary, StrutsTextExtMessages.Tag);
+
+ String tag = MessageFormat.format(StrutsTextExtMessages.ForTag, tagName);
+
+ return MessageFormat.format(StrutsTextExtMessages.OpenTagLibrary, tag);
+ }
}
Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsLinkHyperlink.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsLinkHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076)
+++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsLinkHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077)
@@ -13,7 +13,6 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.jboss.tools.common.text.ext.hyperlink.LinkHyperlink;
-import org.jboss.tools.struts.text.ext.StrutsExtensionsPlugin;
/**
* @author Jeremy
Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsLogicPropertyHyperlink.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsLogicPropertyHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076)
+++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsLogicPropertyHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077)
@@ -10,6 +10,7 @@
******************************************************************************/
package org.jboss.tools.struts.text.ext.hyperlink;
+import java.text.MessageFormat;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -19,22 +20,22 @@
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IRegion;
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Text;
-
import org.jboss.tools.common.model.XModel;
import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink;
+import org.jboss.tools.common.text.ext.hyperlink.jsp.JSPRootHyperlinkPartitioner;
+import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages;
import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
import org.jboss.tools.common.text.ext.util.Utils;
-import org.jboss.tools.common.text.ext.hyperlink.jsp.JSPRootHyperlinkPartitioner;
import org.jboss.tools.jst.web.project.WebProject;
import org.jboss.tools.jst.web.project.list.WebPromptingProvider;
import org.jboss.tools.jst.web.tld.TaglibMapping;
import org.jboss.tools.struts.text.ext.StrutsExtensionsPlugin;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.w3c.dom.Text;
/**
* @author Jeremy
@@ -251,12 +252,13 @@
}
}
+ IRegion fLastRegion = null;
/**
* @see com.ibm.sse.editor.AbstractHyperlink#doGetHyperlinkRegion(int)
*/
protected IRegion doGetHyperlinkRegion(int offset) {
- IRegion region = getRegion(offset);
- return region;
+ fLastRegion = getRegion(offset);
+ return fLastRegion;
}
private IRegion getRegion(int offset) {
@@ -351,4 +353,17 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see IHyperlink#getHyperlinkText()
+ */
+ public String getHyperlinkText() {
+ String forId = getForId(fLastRegion);
+ if (forId == null)
+ return MessageFormat.format(Messages.BrowseFor, Messages.BeanId);
+
+ return MessageFormat.format(Messages.BrowseForBeanId, forId);
+ }
+
}
\ No newline at end of file
Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsPageHyperlink.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsPageHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076)
+++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsPageHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077)
@@ -10,14 +10,16 @@
******************************************************************************/
package org.jboss.tools.struts.text.ext.hyperlink;
+import java.text.MessageFormat;
import java.util.Properties;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IRegion;
-
+import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages;
import org.jboss.tools.common.text.ext.util.Utils;
import org.jboss.tools.jst.web.project.list.WebPromptingProvider;
import org.jboss.tools.struts.text.ext.StrutsExtensionsPlugin;
+import org.jboss.tools.struts.text.ext.StrutsTextExtMessages;
/**
* @author Jeremy
@@ -48,4 +50,18 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see IHyperlink#getHyperlinkText()
+ */
+ public String getHyperlinkText() {
+ String page = getPage(fLastRegion);
+ if (page == null)
+ return MessageFormat.format(Messages.OpenA, StrutsTextExtMessages.Page);
+
+ return MessageFormat.format(StrutsTextExtMessages.OpenPage, page);
+ }
+
+
}
Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsPropertiesFileHyperlink.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsPropertiesFileHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076)
+++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsPropertiesFileHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077)
@@ -10,13 +10,16 @@
******************************************************************************/
package org.jboss.tools.struts.text.ext.hyperlink;
+import java.text.MessageFormat;
import java.util.Properties;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IRegion;
+import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages;
import org.jboss.tools.common.text.ext.util.Utils;
import org.jboss.tools.jst.web.project.list.WebPromptingProvider;
import org.jboss.tools.struts.text.ext.StrutsExtensionsPlugin;
+import org.jboss.tools.struts.text.ext.StrutsTextExtMessages;
/**
* @author Jeremy
@@ -46,4 +49,17 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see IHyperlink#getHyperlinkText()
+ */
+ public String getHyperlinkText() {
+ String propertyName = getProperty(fLastRegion);
+ if (propertyName == null)
+ return MessageFormat.format(Messages.OpenA, StrutsTextExtMessages.Property);
+
+ return MessageFormat.format(StrutsTextExtMessages.OpenProperty, propertyName);
+ }
+
}
Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsPropertyHyperlink.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsPropertyHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076)
+++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsPropertyHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077)
@@ -10,18 +10,20 @@
******************************************************************************/
package org.jboss.tools.struts.text.ext.hyperlink;
+import java.text.MessageFormat;
import java.util.Properties;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IRegion;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-
+import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages;
import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
import org.jboss.tools.common.text.ext.util.Utils;
import org.jboss.tools.jst.web.project.list.WebPromptingProvider;
import org.jboss.tools.struts.text.ext.StrutsExtensionsPlugin;
+import org.jboss.tools.struts.text.ext.StrutsTextExtMessages;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
/**
* @author Jeremy
@@ -137,4 +139,19 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see IHyperlink#getHyperlinkText()
+ */
+ public String getHyperlinkText() {
+ String propertyName = getProperty(fLastRegion);
+ String actionName = getFormAction(fLastRegion);
+ if (propertyName == null || actionName == null)
+ return MessageFormat.format(Messages.OpenA, StrutsTextExtMessages.Property);
+
+ return MessageFormat.format(StrutsTextExtMessages.OpenPropertyForFormAction, propertyName, actionName);
+ }
+
+
}
\ No newline at end of file
Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsTaglibDirectiveHyperlink.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsTaglibDirectiveHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076)
+++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsTaglibDirectiveHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077)
@@ -10,21 +10,22 @@
******************************************************************************/
package org.jboss.tools.struts.text.ext.hyperlink;
+import java.text.MessageFormat;
import java.util.Properties;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.IRegion;
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-
+import org.jboss.tools.common.text.ext.hyperlink.XModelBasedHyperlink;
+import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages;
import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
import org.jboss.tools.common.text.ext.util.Utils;
-import org.jboss.tools.common.text.ext.hyperlink.XModelBasedHyperlink;
import org.jboss.tools.jst.web.project.list.WebPromptingProvider;
import org.jboss.tools.struts.text.ext.StrutsExtensionsPlugin;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
/**
* @author Jeremy
@@ -36,8 +37,7 @@
return WebPromptingProvider.STRUTS_OPEN_TAG_LIBRARY;
}
- protected Properties getRequestProperties(IRegion region) {
- Properties p = new Properties();
+ private String getTaglibUri(IRegion region) {
StructuredModelWrapper smw = new StructuredModelWrapper();
smw.init(getDocument());
try {
@@ -53,12 +53,23 @@
String uri = getAttributeValue(getDocument(), node, "uri");
if (uri != null) {
- p.setProperty("prefix", uri);
+ return uri;
}
} finally {
smw.dispose();
}
+ return null;
+ }
+
+ protected Properties getRequestProperties(IRegion region) {
+ Properties p = new Properties();
+
+ String uri = getTaglibUri(region);
+ if (uri != null) {
+ p.setProperty("prefix", uri);
+ }
+
return p;
}
@@ -120,4 +131,17 @@
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see IHyperlink#getHyperlinkText()
+ */
+ public String getHyperlinkText() {
+ String uri = getTaglibUri(fLastRegion);
+ if (uri == null)
+ return MessageFormat.format(Messages.OpenA, Messages.TagLibrary);
+
+ return MessageFormat.format(Messages.OpenTagLibraryForUri, uri);
+ }
+
}
Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsValidationBundleHyperlink.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsValidationBundleHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076)
+++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsValidationBundleHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077)
@@ -10,14 +10,16 @@
******************************************************************************/
package org.jboss.tools.struts.text.ext.hyperlink;
+import java.text.MessageFormat;
import java.util.Properties;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IRegion;
-
+import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages;
import org.jboss.tools.common.text.ext.util.Utils;
import org.jboss.tools.jst.web.project.list.WebPromptingProvider;
import org.jboss.tools.struts.text.ext.StrutsExtensionsPlugin;
+import org.jboss.tools.struts.text.ext.StrutsTextExtMessages;
/**
* @author Jeremy
@@ -51,4 +53,17 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see IHyperlink#getHyperlinkText()
+ */
+ public String getHyperlinkText() {
+ String baseName = getBundle(fLastRegion);
+ if (baseName == null)
+ return MessageFormat.format(Messages.OpenA, StrutsTextExtMessages.ValidationBundle);
+
+ return MessageFormat.format(StrutsTextExtMessages.OpenValidationBundle, baseName);
+ }
+
}
Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsValidationBundleKeyHyperlink.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsValidationBundleKeyHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076)
+++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsValidationBundleKeyHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077)
@@ -10,18 +10,20 @@
******************************************************************************/
package org.jboss.tools.struts.text.ext.hyperlink;
+import java.text.MessageFormat;
import java.util.Properties;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IRegion;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-
+import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages;
import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
import org.jboss.tools.common.text.ext.util.Utils;
import org.jboss.tools.jst.web.project.list.WebPromptingProvider;
import org.jboss.tools.struts.text.ext.StrutsExtensionsPlugin;
+import org.jboss.tools.struts.text.ext.StrutsTextExtMessages;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
/**
* @author Jeremy
@@ -79,4 +81,18 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see IHyperlink#getHyperlinkText()
+ */
+ public String getHyperlinkText() {
+ String propertyName = getKey(fLastRegion);
+ String baseName = getBundle(fLastRegion);
+ if (propertyName == null || baseName == null)
+ return MessageFormat.format(Messages.OpenA, StrutsTextExtMessages.ValidationBundleProperty);
+
+ return MessageFormat.format(StrutsTextExtMessages.OpenValidationBundlePropertyForBundle, propertyName, baseName);
+ }
+
}
Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsValidationMethodHyperlink.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsValidationMethodHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076)
+++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsValidationMethodHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077)
@@ -10,11 +10,13 @@
******************************************************************************/
package org.jboss.tools.struts.text.ext.hyperlink;
+import java.text.MessageFormat;
+
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IRegion;
-
+import org.jboss.tools.common.text.ext.hyperlink.ClassMethodHyperlink;
+import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages;
import org.jboss.tools.common.text.ext.util.Utils;
-import org.jboss.tools.common.text.ext.hyperlink.ClassMethodHyperlink;
import org.jboss.tools.struts.text.ext.StrutsExtensionsPlugin;
/**
@@ -45,4 +47,19 @@
protected String getMethodParams(IRegion region) {
return getAttributeValue(region, METHODPARAMS_ATTRNAME);
}
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see IHyperlink#getHyperlinkText()
+ */
+ public String getHyperlinkText() {
+ String methodName = getMethodName(fLastRegion);
+ if (methodName == null)
+ return MessageFormat.format(Messages.OpenA, Messages.ValidationMethod);
+
+ return MessageFormat.format(Messages.OpenValidationMethod, methodName);
+ }
+
+
}
Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsValidationMethodHyperlink0.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsValidationMethodHyperlink0.java 2008-07-04 12:19:57 UTC (rev 9076)
+++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsValidationMethodHyperlink0.java 2008-07-04 14:16:57 UTC (rev 9077)
@@ -10,18 +10,19 @@
******************************************************************************/
package org.jboss.tools.struts.text.ext.hyperlink;
+import java.text.MessageFormat;
import java.util.Properties;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IRegion;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-
+import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages;
import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
import org.jboss.tools.common.text.ext.util.Utils;
import org.jboss.tools.jst.web.project.list.WebPromptingProvider;
import org.jboss.tools.struts.text.ext.StrutsExtensionsPlugin;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
/**
* @author Jeremy
@@ -95,4 +96,17 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see IHyperlink#getHyperlinkText()
+ */
+ public String getHyperlinkText() {
+ String methodName = getMethodName(fLastRegion);
+ if (methodName == null)
+ return MessageFormat.format(Messages.OpenA, Messages.ValidationMethod);
+
+ return MessageFormat.format(Messages.OpenValidationMethod, methodName);
+ }
+
}
Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsValidationPropertyHyperlink.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsValidationPropertyHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076)
+++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsValidationPropertyHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077)
@@ -10,18 +10,20 @@
******************************************************************************/
package org.jboss.tools.struts.text.ext.hyperlink;
+import java.text.MessageFormat;
import java.util.Properties;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IRegion;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-
+import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages;
import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
import org.jboss.tools.common.text.ext.util.Utils;
import org.jboss.tools.jst.web.project.list.WebPromptingProvider;
import org.jboss.tools.struts.text.ext.StrutsExtensionsPlugin;
+import org.jboss.tools.struts.text.ext.StrutsTextExtMessages;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
/**
* @author Jeremy
@@ -80,4 +82,18 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see IHyperlink#getHyperlinkText()
+ */
+ public String getHyperlinkText() {
+ String propertyName = getProperty(fLastRegion);
+ String formName = getFormName(fLastRegion);
+ if (propertyName == null || formName == null)
+ return MessageFormat.format(Messages.OpenA, StrutsTextExtMessages.ValidationProperty);
+
+ return MessageFormat.format(StrutsTextExtMessages.OpenValidationProperty, propertyName, formName);
+ }
+
}
Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsValidationValidatorHyperlink.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsValidationValidatorHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076)
+++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsValidationValidatorHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077)
@@ -10,18 +10,20 @@
******************************************************************************/
package org.jboss.tools.struts.text.ext.hyperlink;
+import java.text.MessageFormat;
import java.util.Properties;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IRegion;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-
+import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages;
import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
import org.jboss.tools.common.text.ext.util.Utils;
import org.jboss.tools.jst.web.project.list.WebPromptingProvider;
import org.jboss.tools.struts.text.ext.StrutsExtensionsPlugin;
+import org.jboss.tools.struts.text.ext.StrutsTextExtMessages;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
/**
* @author Jeremy
@@ -127,4 +129,18 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see IHyperlink#getHyperlinkText()
+ */
+ public String getHyperlinkText() {
+ String validator = getAttributeValue(fLastRegion);
+ if (validator == null)
+ return MessageFormat.format(Messages.OpenA, StrutsTextExtMessages.Validator);
+
+ return MessageFormat.format(StrutsTextExtMessages.OpenValidator, validator);
+ }
+
+
}
Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsXModelBasedHyperlink.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsXModelBasedHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076)
+++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsXModelBasedHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077)
@@ -17,17 +17,16 @@
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.IRegion;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.w3c.dom.Text;
-
import org.jboss.tools.common.model.XModel;
import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink;
import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
import org.jboss.tools.common.text.ext.util.Utils;
import org.jboss.tools.jst.web.project.list.WebPromptingProvider;
import org.jboss.tools.struts.text.ext.StrutsExtensionsPlugin;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import org.w3c.dom.Text;
/**
* @author Jeremy
@@ -62,11 +61,13 @@
protected abstract Properties getRequestProperties(IRegion region);
+ protected IRegion fLastRegion = null;
/**
* @see com.ibm.sse.editor.AbstractHyperlink#doGetHyperlinkRegion(int)
*/
protected IRegion doGetHyperlinkRegion(int offset) {
- return getRegion(offset);
+ fLastRegion = getRegion(offset);
+ return fLastRegion;
}
protected IRegion getRegion (int offset) {
15 years, 9 months
- 1
- 0
JBoss Tools SVN: r9076 - trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/commands.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-07-04 08:19:57 -0400 (Fri, 04 Jul 2008)
New Revision: 9076
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/commands/AddExceptionOnDiagramHandler.java
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/commands/AddPageOnDiagramHandler.java
Log:
JBIDE-1189
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/commands/AddExceptionOnDiagramHandler.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/commands/AddExceptionOnDiagramHandler.java 2008-07-04 12:19:13 UTC (rev 9075)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/commands/AddExceptionOnDiagramHandler.java 2008-07-04 12:19:57 UTC (rev 9076)
@@ -1,11 +1,17 @@
package org.jboss.tools.seam.ui.pages.editor.commands;
import java.util.Properties;
+import java.util.Random;
-import org.jboss.tools.common.meta.action.XActionInvoker;
+import org.jboss.tools.common.meta.XChild;
+import org.jboss.tools.common.meta.XModelEntity;
import org.jboss.tools.common.meta.action.impl.AbstractHandler;
import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.XModelObject;
+import org.jboss.tools.common.model.util.FindObjectHelper;
+import org.jboss.tools.common.model.util.XModelObjectLoaderUtil;
+import org.jboss.tools.seam.pages.xml.model.SeamPagesConstants;
+import org.jboss.tools.seam.pages.xml.model.handlers.AddExceptionHandler;
import org.jboss.tools.seam.ui.pages.editor.edit.PagesDiagramEditPart;
public class AddExceptionOnDiagramHandler extends AbstractHandler {
@@ -23,7 +29,45 @@
int y = Integer.parseInt(p.getProperty("mouse.y"));
System.out.println("x=" + x + " y=" + y + " part=" + part);
+ String className = "/test" + (new Random()).nextInt(10000);
+ AddExceptionOnDiagramHandler.createException(object, className, p);
+
// XActionInvoker.invoke("CreateActions.AddExceptionWizard", object, p);
}
+ /**
+ *
+ * @param diagram Root object for diagram model
+ * @param viewId User input
+ * @param p Properties passed to handler that include mouse coordinates
+ */
+ public static void createException(XModelObject diagram, String className, Properties p) {
+ XModelObject m = diagram.getParent().getChildByPath(SeamPagesConstants.FOLDER_EXCEPTIONS);
+ String childEntity = m.getModelEntity().getChildren()[0].getName();
+ XModelObject e = m.getModel().createModelObject(childEntity, null);
+ e.setAttributeValue("class", className);
+ XModelObject c = XModelObjectLoaderUtil.createValidObject(diagram.getModel(), getRedirectChildEntity(e.getModelEntity()), p);
+ c.setAttributeValue(SeamPagesConstants.ATTR_VIEW_ID, "");
+ e.addChild(c);
+ m.addChild(e);
+ m.setModified(true);
+ String pp = e.getPathPart();
+ XModelObject created = diagram.getChildByPath(pp);
+ String shape = AddExceptionHandler.getShape(p);
+ if(created != null && shape != null) created.setAttributeValue("shape", shape);
+ if(created != null) {
+ FindObjectHelper.findModelObject(created, FindObjectHelper.IN_EDITOR_ONLY);
+ }
+ }
+
+ static String getRedirectChildEntity(XModelEntity exc) {
+ XChild[] cs = exc.getChildren();
+ for (int i = 0; i < cs.length; i++) {
+ if(cs[i].getName().startsWith("SeamPageRedirect")) {
+ return cs[i].getName();
+ }
+ }
+ return null;
+ }
+
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/commands/AddPageOnDiagramHandler.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/commands/AddPageOnDiagramHandler.java 2008-07-04 12:19:13 UTC (rev 9075)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/commands/AddPageOnDiagramHandler.java 2008-07-04 12:19:57 UTC (rev 9076)
@@ -1,11 +1,16 @@
package org.jboss.tools.seam.ui.pages.editor.commands;
import java.util.Properties;
+import java.util.Random;
-import org.jboss.tools.common.meta.action.XActionInvoker;
import org.jboss.tools.common.meta.action.impl.AbstractHandler;
import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.XModelObject;
+import org.jboss.tools.common.model.util.FindObjectHelper;
+import org.jboss.tools.seam.pages.xml.model.SeamPagesConstants;
+import org.jboss.tools.seam.pages.xml.model.handlers.AddExceptionHandler;
+import org.jboss.tools.seam.pages.xml.model.handlers.AddViewSupport;
+import org.jboss.tools.seam.pages.xml.model.helpers.SeamPagesDiagramHelper;
import org.jboss.tools.seam.ui.pages.editor.edit.PagesDiagramEditPart;
public class AddPageOnDiagramHandler extends AbstractHandler {
@@ -23,7 +28,31 @@
int y = Integer.parseInt(p.getProperty("mouse.y"));
System.out.println("x=" + x + " y=" + y + " part=" + part);
+//
+ String viewId = "/test" + (new Random()).nextInt(10000);
+ AddPageOnDiagramHandler.createPage(object, viewId, p);
+
// XActionInvoker.invoke("CreateActions.AddPageWizard", object, p);
}
+ /**
+ *
+ * @param diagram Root object for diagram model
+ * @param viewId User input
+ * @param p Properties passed to handler that include mouse coordinates
+ */
+ public static void createPage(XModelObject diagram, String viewId, Properties p) {
+ XModelObject m = diagram.getParent().getChildByPath(SeamPagesConstants.FOLDER_PAGES);
+ String path = AddViewSupport.revalidatePath(viewId);
+ String pp = SeamPagesDiagramHelper.toNavigationRulePathPart(path);
+ XModelObject rule = AddViewSupport.addPage(m, path);
+ m.setModified(true);
+ XModelObject created = diagram.getChildByPath(pp);
+ String shape = AddExceptionHandler.getShape(p);
+ if(created != null && shape != null) created.setAttributeValue("shape", shape);
+ if(created != null) {
+ FindObjectHelper.findModelObject(created, FindObjectHelper.IN_EDITOR_ONLY);
+ }
+ }
+
}
15 years, 9 months
- 1
- 0