JBoss Tools SVN: r6907 - in trunk/hibernatetools/docs/reference/en/images: code_generation and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: ykryvinchanka
Date: 2008-03-13 10:20:16 -0400 (Thu, 13 Mar 2008)
New Revision: 6907
Added:
trunk/hibernatetools/docs/reference/en/images/code_generation/
trunk/hibernatetools/docs/reference/en/images/code_generation/code_generation_1.png
trunk/hibernatetools/docs/reference/en/images/plugins/plugins_22.png
Removed:
trunk/hibernatetools/docs/reference/en/images/architecture.gif
trunk/hibernatetools/docs/reference/en/images/architecture.odg
trunk/hibernatetools/docs/reference/en/images/architecture.png
trunk/hibernatetools/docs/reference/en/images/basicprojectoutline.gif
trunk/hibernatetools/docs/reference/en/images/cfgxml-propertycomplete.png
trunk/hibernatetools/docs/reference/en/images/cfgxmlcompletion.gif
trunk/hibernatetools/docs/reference/en/images/codegencommon.gif
trunk/hibernatetools/docs/reference/en/images/codegendropdown.gif
trunk/hibernatetools/docs/reference/en/images/codegendropdown.png
trunk/hibernatetools/docs/reference/en/images/codegenexporters.png
trunk/hibernatetools/docs/reference/en/images/codegenmaintab.png
trunk/hibernatetools/docs/reference/en/images/codegenrefreshtab.gif
trunk/hibernatetools/docs/reference/en/images/codegenwizard.gif
trunk/hibernatetools/docs/reference/en/images/codegenwizard.jpg
trunk/hibernatetools/docs/reference/en/images/columncompletion.png
trunk/hibernatetools/docs/reference/en/images/configuration-outline-afterreveng.gif
trunk/hibernatetools/docs/reference/en/images/console-contextmenu.gif
trunk/hibernatetools/docs/reference/en/images/consolecfgclasspath.gif
trunk/hibernatetools/docs/reference/en/images/consolecfgclasspath.png
trunk/hibernatetools/docs/reference/en/images/consolecfgmappings.gif
trunk/hibernatetools/docs/reference/en/images/consolecfgmappings.png
trunk/hibernatetools/docs/reference/en/images/consolecfgwizard.jpg
trunk/hibernatetools/docs/reference/en/images/consolecfgwizard.png
trunk/hibernatetools/docs/reference/en/images/consoleoutline-before-reven.png
trunk/hibernatetools/docs/reference/en/images/consoleoutline-before-reveng.png
trunk/hibernatetools/docs/reference/en/images/dynamicquerytranslation.png
trunk/hibernatetools/docs/reference/en/images/entitymodel.png
trunk/hibernatetools/docs/reference/en/images/entityproperties.gif
trunk/hibernatetools/docs/reference/en/images/hbmxml-namecompletion.png
trunk/hibernatetools/docs/reference/en/images/hbmxml-tablecompletion.png
trunk/hibernatetools/docs/reference/en/images/hbmxml-typecompletion.png
trunk/hibernatetools/docs/reference/en/images/hbmxmlcompletion.gif
trunk/hibernatetools/docs/reference/en/images/hbmxmlcompletion.jpg
trunk/hibernatetools/docs/reference/en/images/hibernate_logo_a.png
trunk/hibernatetools/docs/reference/en/images/hibernatecfgwizard.gif
trunk/hibernatetools/docs/reference/en/images/hibernatecfgwizard.png
trunk/hibernatetools/docs/reference/en/images/hibernatecfgxml-after-reveng.gif
trunk/hibernatetools/docs/reference/en/images/hibernateprojectsettings.gif
trunk/hibernatetools/docs/reference/en/images/hibernaterevengeditor.gif
trunk/hibernatetools/docs/reference/en/images/hqleditor.gif
trunk/hibernatetools/docs/reference/en/images/hqlscratchpad-icon.gif
trunk/hibernatetools/docs/reference/en/images/plugins/plugins_13a.png
trunk/hibernatetools/docs/reference/en/images/properties.png
trunk/hibernatetools/docs/reference/en/images/queryconsole.png
trunk/hibernatetools/docs/reference/en/images/queryparameters.gif
trunk/hibernatetools/docs/reference/en/images/revengoptionfromwizard.gif
trunk/hibernatetools/docs/reference/en/images/revengtablefilterwizard.gif
trunk/hibernatetools/docs/reference/en/images/revengxml_overview.png
trunk/hibernatetools/docs/reference/en/images/revengxml_tablefilters.png
trunk/hibernatetools/docs/reference/en/images/revengxml_tablescolumn.png
trunk/hibernatetools/docs/reference/en/images/revengxml_typemappings.png
trunk/hibernatetools/docs/reference/en/images/selectnewwizard.gif
trunk/hibernatetools/docs/reference/en/images/selectsrc-for-hibernatecfgxml.gif
trunk/hibernatetools/docs/reference/en/images/tablecolumnseditor.gif
trunk/hibernatetools/docs/reference/en/images/typemappingseditor.gif
trunk/hibernatetools/docs/reference/en/images/xmloutline.gif
Log:
http://jira.jboss.com/jira/browse/JBDS-262 deleting unusable images
Deleted: trunk/hibernatetools/docs/reference/en/images/architecture.gif
===================================================================
(Binary files differ)
Deleted: trunk/hibernatetools/docs/reference/en/images/architecture.odg
===================================================================
(Binary files differ)
Deleted: trunk/hibernatetools/docs/reference/en/images/architecture.png
===================================================================
(Binary files differ)
Deleted: trunk/hibernatetools/docs/reference/en/images/basicprojectoutline.gif
===================================================================
(Binary files differ)
Deleted: trunk/hibernatetools/docs/reference/en/images/cfgxml-propertycomplete.png
===================================================================
(Binary files differ)
Deleted: trunk/hibernatetools/docs/reference/en/images/cfgxmlcompletion.gif
===================================================================
(Binary files differ)
Added: trunk/hibernatetools/docs/reference/en/images/code_generation/code_generation_1.png
===================================================================
(Binary files differ)
Property changes on: trunk/hibernatetools/docs/reference/en/images/code_generation/code_generation_1.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/hibernatetools/docs/reference/en/images/codegencommon.gif
===================================================================
(Binary files differ)
Deleted: trunk/hibernatetools/docs/reference/en/images/codegendropdown.gif
===================================================================
(Binary files differ)
Deleted: trunk/hibernatetools/docs/reference/en/images/codegendropdown.png
===================================================================
(Binary files differ)
Deleted: trunk/hibernatetools/docs/reference/en/images/codegenexporters.png
===================================================================
(Binary files differ)
Deleted: trunk/hibernatetools/docs/reference/en/images/codegenmaintab.png
===================================================================
(Binary files differ)
Deleted: trunk/hibernatetools/docs/reference/en/images/codegenrefreshtab.gif
===================================================================
(Binary files differ)
Deleted: trunk/hibernatetools/docs/reference/en/images/codegenwizard.gif
===================================================================
(Binary files differ)
Deleted: trunk/hibernatetools/docs/reference/en/images/codegenwizard.jpg
===================================================================
(Binary files differ)
Deleted: trunk/hibernatetools/docs/reference/en/images/columncompletion.png
===================================================================
(Binary files differ)
Deleted: trunk/hibernatetools/docs/reference/en/images/configuration-outline-afterreveng.gif
===================================================================
(Binary files differ)
Deleted: trunk/hibernatetools/docs/reference/en/images/console-contextmenu.gif
===================================================================
(Binary files differ)
Deleted: trunk/hibernatetools/docs/reference/en/images/consolecfgclasspath.gif
===================================================================
(Binary files differ)
Deleted: trunk/hibernatetools/docs/reference/en/images/consolecfgclasspath.png
===================================================================
(Binary files differ)
Deleted: trunk/hibernatetools/docs/reference/en/images/consolecfgmappings.gif
===================================================================
(Binary files differ)
Deleted: trunk/hibernatetools/docs/reference/en/images/consolecfgmappings.png
===================================================================
(Binary files differ)
Deleted: trunk/hibernatetools/docs/reference/en/images/consolecfgwizard.jpg
===================================================================
(Binary files differ)
Deleted: trunk/hibernatetools/docs/reference/en/images/consolecfgwizard.png
===================================================================
(Binary files differ)
Deleted: trunk/hibernatetools/docs/reference/en/images/consoleoutline-before-reven.png
===================================================================
(Binary files differ)
Deleted: trunk/hibernatetools/docs/reference/en/images/consoleoutline-before-reveng.png
===================================================================
(Binary files differ)
Deleted: trunk/hibernatetools/docs/reference/en/images/dynamicquerytranslation.png
===================================================================
(Binary files differ)
Deleted: trunk/hibernatetools/docs/reference/en/images/entitymodel.png
===================================================================
(Binary files differ)
Deleted: trunk/hibernatetools/docs/reference/en/images/entityproperties.gif
===================================================================
(Binary files differ)
Deleted: trunk/hibernatetools/docs/reference/en/images/hbmxml-namecompletion.png
===================================================================
(Binary files differ)
Deleted: trunk/hibernatetools/docs/reference/en/images/hbmxml-tablecompletion.png
===================================================================
(Binary files differ)
Deleted: trunk/hibernatetools/docs/reference/en/images/hbmxml-typecompletion.png
===================================================================
(Binary files differ)
Deleted: trunk/hibernatetools/docs/reference/en/images/hbmxmlcompletion.gif
===================================================================
(Binary files differ)
Deleted: trunk/hibernatetools/docs/reference/en/images/hbmxmlcompletion.jpg
===================================================================
(Binary files differ)
Deleted: trunk/hibernatetools/docs/reference/en/images/hibernate_logo_a.png
===================================================================
(Binary files differ)
Deleted: trunk/hibernatetools/docs/reference/en/images/hibernatecfgwizard.gif
===================================================================
(Binary files differ)
Deleted: trunk/hibernatetools/docs/reference/en/images/hibernatecfgwizard.png
===================================================================
(Binary files differ)
Deleted: trunk/hibernatetools/docs/reference/en/images/hibernatecfgxml-after-reveng.gif
===================================================================
(Binary files differ)
Deleted: trunk/hibernatetools/docs/reference/en/images/hibernateprojectsettings.gif
===================================================================
(Binary files differ)
Deleted: trunk/hibernatetools/docs/reference/en/images/hibernaterevengeditor.gif
===================================================================
(Binary files differ)
Deleted: trunk/hibernatetools/docs/reference/en/images/hqleditor.gif
===================================================================
(Binary files differ)
Deleted: trunk/hibernatetools/docs/reference/en/images/hqlscratchpad-icon.gif
===================================================================
(Binary files differ)
Deleted: trunk/hibernatetools/docs/reference/en/images/plugins/plugins_13a.png
===================================================================
(Binary files differ)
Added: trunk/hibernatetools/docs/reference/en/images/plugins/plugins_22.png
===================================================================
(Binary files differ)
Property changes on: trunk/hibernatetools/docs/reference/en/images/plugins/plugins_22.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/hibernatetools/docs/reference/en/images/properties.png
===================================================================
(Binary files differ)
Deleted: trunk/hibernatetools/docs/reference/en/images/queryconsole.png
===================================================================
(Binary files differ)
Deleted: trunk/hibernatetools/docs/reference/en/images/queryparameters.gif
===================================================================
(Binary files differ)
Deleted: trunk/hibernatetools/docs/reference/en/images/revengoptionfromwizard.gif
===================================================================
(Binary files differ)
Deleted: trunk/hibernatetools/docs/reference/en/images/revengtablefilterwizard.gif
===================================================================
(Binary files differ)
Deleted: trunk/hibernatetools/docs/reference/en/images/revengxml_overview.png
===================================================================
(Binary files differ)
Deleted: trunk/hibernatetools/docs/reference/en/images/revengxml_tablefilters.png
===================================================================
(Binary files differ)
Deleted: trunk/hibernatetools/docs/reference/en/images/revengxml_tablescolumn.png
===================================================================
(Binary files differ)
Deleted: trunk/hibernatetools/docs/reference/en/images/revengxml_typemappings.png
===================================================================
(Binary files differ)
Deleted: trunk/hibernatetools/docs/reference/en/images/selectnewwizard.gif
===================================================================
(Binary files differ)
Deleted: trunk/hibernatetools/docs/reference/en/images/selectsrc-for-hibernatecfgxml.gif
===================================================================
(Binary files differ)
Deleted: trunk/hibernatetools/docs/reference/en/images/tablecolumnseditor.gif
===================================================================
(Binary files differ)
Deleted: trunk/hibernatetools/docs/reference/en/images/typemappingseditor.gif
===================================================================
(Binary files differ)
Deleted: trunk/hibernatetools/docs/reference/en/images/xmloutline.gif
===================================================================
(Binary files differ)
16 years, 3 months
- 1
- 0
JBoss Tools SVN: r6906 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2008-03-13 09:30:58 -0400 (Thu, 13 Mar 2008)
New Revision: 6906
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDataTableColumnCreator.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDataTableCreator.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDataTableElements.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1744, row and column classes added, code adjustment.
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDataTableColumnCreator.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDataTableColumnCreator.java 2008-03-13 12:35:18 UTC (rev 6905)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDataTableColumnCreator.java 2008-03-13 13:30:58 UTC (rev 6906)
@@ -66,9 +66,9 @@
String styleClass = "";
String tableHeaderClass = getNodeAttrValue(sourceNode.getParentNode(), VpeTemplateManager.ATTR_DATATABLE_HEADER_CLASS);
String columnHeaderClass = getNodeAttrValue(sourceNode, VpeTemplateManager.ATTR_DATATABLE_HEADER_CLASS);
- if (null != columnHeaderClass && !"".equalsIgnoreCase(columnHeaderClass)) {
+ if (null != columnHeaderClass) {
styleClass = columnHeaderClass;
- } else if (null != tableHeaderClass && !"".equalsIgnoreCase(tableHeaderClass)) {
+ } else if (null != tableHeaderClass) {
styleClass = tableHeaderClass;
}
setCellClass(cell, styleClass);
@@ -84,14 +84,14 @@
styleClass = "";
String tableFooterClass = getNodeAttrValue(sourceNode.getParentNode(), VpeTemplateManager.ATTR_DATATABLE_FOOTER_CLASS);
String columnFooterClass = getNodeAttrValue(sourceNode, VpeTemplateManager.ATTR_DATATABLE_FOOTER_CLASS);
- if (null != columnFooterClass && !"".equalsIgnoreCase(columnFooterClass)) {
+ if (null != columnFooterClass) {
styleClass = columnFooterClass;
- } else if (null != tableFooterClass && !"".equalsIgnoreCase(tableFooterClass)) {
+ } else if (null != tableFooterClass) {
styleClass = tableFooterClass;
}
setCellClass(cell, styleClass);
visualColumnElements.setFooterCell(cell);
-
+
cell = VpeDataTableElements.makeCell(visualDataTableElements.getBodyRow(), index, HTML.TAG_TD, visualDocument);
NodeList list = sourceNode.getChildNodes();
int cnt = list != null ? list.getLength() : 0;
@@ -116,6 +116,11 @@
}
}
creatorInfo.addChildrenInfo(info);
+
+ String columnClasses = getNodeAttrValue(sourceNode.getParentNode(), VpeTemplateManager.ATTR_DATATABLE_COLUMN_CLASSES);
+ if (null != columnClasses) {
+ setColumnClassesToCell(cell, columnClasses, index);
+ }
visualColumnElements.setBodyCell(cell);
}
visualNodeMap.put(this, visualColumnElements);
@@ -167,10 +172,61 @@
return ind < name2.length() && name1.equals(name2.substring(ind >= 0 ? ind + 1 : 0));
}
- private void setCellClass(nsIDOMNode cell, String className) {
+ /**
+ * Sets the column classes to cell.
+ *
+ * @param cell the cell
+ * @param columnClasses the column classes
+ * @param index the index of the column in the table
+ */
+ private void setColumnClassesToCell(nsIDOMElement cell,
+ String columnClasses, int index) {
if (cell != null) {
+ String[] classes = splitClasses(columnClasses);
+
+ if ((null != classes) && (classes.length > 0)) {
+ int len = classes.length;
+ int indx = index + 1;
+ String className = "";
+
+ if (indx <= len) {
+ className = classes[indx - 1];
+ } else {
+ int idx = indx % len;
+ className = classes[idx];
+ }
+ if (className.trim().length() > 0) {
+ cell.setAttribute("class", className);
+ }
+ }
+
+ }
+ }
+
+ /**
+ * Splits a sequence of classes to an array of separate classes.
+ *
+ * @param value the sequence of classes
+ *
+ * @return the array of separate classes
+ */
+ private String[] splitClasses(String value) {
+ if (value != null) {
+ return value.split(",");
+ }
+ return null;
+ }
+
+ /**
+ * Sets the css class to the cell.
+ *
+ * @param cell the cell
+ * @param className the class name
+ */
+ private void setCellClass(nsIDOMElement cell, String className) {
+ if (cell != null) {
if (className != null && className.trim().length() > 0) {
- ((nsIDOMElement)cell).setAttribute("class", className);
+ cell.setAttribute("class", className);
}
}
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDataTableCreator.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDataTableCreator.java 2008-03-13 12:35:18 UTC (rev 6905)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDataTableCreator.java 2008-03-13 13:30:58 UTC (rev 6906)
@@ -190,7 +190,7 @@
row = visualDocument.createElement(HTML.TAG_TR);
section.appendChild(row);
visualTable.appendChild(section);
- //visualElements.setBodyRow(row);
+ visualElements.setContentTableBodyRow(row);
//visualElements.setBody(section);
}
@@ -246,6 +246,9 @@
if (ATTR_BORDER.equalsIgnoreCase(attr.getNodeName())) {
visualTable.setAttribute(ATTR_BORDER, attr.getNodeValue());
}
+ if (VpeTemplateManager.ATTR_DATATABLE_ROW_CLASSES.equalsIgnoreCase(attr.getNodeName())) {
+ setRowClass(visualElements.getContentTableBodyRow(), attr.getNodeValue());
+ }
outterTable.setAttributeNode(attr);
}
}
@@ -263,9 +266,9 @@
setCellsClass(visualElements.getColumnsFooterRow(), value);
setCellsClass(visualElements.getTableFooterRow(), value);
} else if (caseSensitive ? VpeTemplateManager.ATTR_DATATABLE_ROW_CLASSES.equals(name) : VpeTemplateManager.ATTR_DATATABLE_ROW_CLASSES.equalsIgnoreCase(name)) {
- setRowClass(visualElements.getBodyRow(), value);
+ setRowClass(visualElements.getContentTableBodyRow(), value);
} else if (caseSensitive ? VpeTemplateManager.ATTR_DATATABLE_COLUMN_CLASSES.equals(name) : VpeTemplateManager.ATTR_DATATABLE_COLUMN_CLASSES.equalsIgnoreCase(name)) {
- setCellsClass(visualElements.getBodyRow(), value);
+ setCellsClass(visualElements.getContentTableBodyRow(), value);
}
}
}
@@ -337,7 +340,7 @@
if (child != null && child.getNodeType() == nsIDOMNode.ELEMENT_NODE) {
try {
nsIDOMHTMLTableCellElement cell = (nsIDOMHTMLTableCellElement) child
- .queryInterface(nsIDOMHTMLTableCellElement.NS_IDOMHTMLTABLECELLELEMENT_IID);
+ .queryInterface(nsIDOMHTMLTableCellElement.NS_IDOMHTMLTABLECELLELEMENT_IID);
cell.setAttribute(ATTR_CLASS, classes[ind]);
ind = ind < (classes.length - 1) ? ind + 1 : 0;
} catch (XPCOMException ex) {
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDataTableElements.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDataTableElements.java 2008-03-13 12:35:18 UTC (rev 6905)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDataTableElements.java 2008-03-13 13:30:58 UTC (rev 6906)
@@ -255,6 +255,8 @@
private nsIDOMElement body;
private nsIDOMElement bodyRow;
+
+ private nsIDOMElement contentTableBodyRow;
private nsIDOMElement tableFooter;
private nsIDOMElement tableFooterRow;
@@ -289,6 +291,14 @@
public void setBodyRow(nsIDOMElement bodyRow) {
this.bodyRow = bodyRow;
}
+
+ public nsIDOMElement getContentTableBodyRow() {
+ return contentTableBodyRow;
+ }
+
+ public void setContentTableBodyRow(nsIDOMElement contentTableBodyRow) {
+ this.contentTableBodyRow = contentTableBodyRow;
+ }
public nsIDOMElement getColumnsFooterRow() {
return columnsFooterRow;
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java 2008-03-13 12:35:18 UTC (rev 6905)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java 2008-03-13 13:30:58 UTC (rev 6906)
@@ -149,7 +149,7 @@
static final String ATTR_DATATABLE_FOOTER_CLASS = "footerClass";
static final String ATTR_DATATABLE_ROW_CLASSES = "rowClasses";
static final String ATTR_DATATABLE_COLUMN_CLASSES = "columnClasses";
- static final String[] ATTR_DATATABLE_PROPERTIES = {"width", "bgcolor","border","cellpadding","cellspacing","frame","rules","class","style","title", "dir"};
+ static final String[] ATTR_DATATABLE_PROPERTIES = {"width", "bgcolor","border","cellpadding","cellspacing","frame","rules","class","style","title", "dir", "rowClasses"};
public static final String ATTR_LINK_HREF = "href";
public static final String ATTR_LINK_REL = "rel";
16 years, 3 months
- 1
- 0
JBoss Tools SVN: r6905 - trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-03-13 08:35:18 -0400 (Thu, 13 Mar 2008)
New Revision: 6905
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileAnyImpl.java
Log:
JBIDE-1903
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileAnyImpl.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileAnyImpl.java 2008-03-12 18:01:33 UTC (rev 6904)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileAnyImpl.java 2008-03-13 12:35:18 UTC (rev 6905)
@@ -249,6 +249,8 @@
private void saveUnopen0() {
if(!isActive()) return;
+ //Be careful!
+ if(!isModified()) return;
SpecialWizard w = SpecialWizardFactory.createSpecialWizard("org.jboss.tools.common.model.ui.objecteditor.SaveUnopenSpecialWizard");
if(w == null) return;
w.setObject(this);
16 years, 3 months
- 1
- 0
JBoss Tools SVN: r6904 - in trunk: jsf/plugins/org.jboss.tools.jsf.doc.user and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2008-03-12 14:01:33 -0400 (Wed, 12 Mar 2008)
New Revision: 6904
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/palette/editor/PaletteDialog.java
trunk/jsf/plugins/org.jboss.tools.jsf.doc.user/plugin.xml
Log:
http://jira.jboss.com/jira/browse/JBIDE-1692
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/palette/editor/PaletteDialog.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/palette/editor/PaletteDialog.java 2008-03-12 17:36:27 UTC (rev 6903)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/palette/editor/PaletteDialog.java 2008-03-12 18:01:33 UTC (rev 6904)
@@ -10,10 +10,6 @@
******************************************************************************/
package org.jboss.tools.common.model.ui.views.palette.editor;
-import org.jboss.tools.common.model.XModelObject;
-import org.jboss.tools.common.model.util.XModelTreeListenerSWTSync;
-import org.jboss.tools.common.model.ui.navigator.*;
-import org.jboss.tools.common.model.ui.objecteditor.XModelObjectEditor;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.viewers.TreeViewer;
@@ -25,12 +21,22 @@
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.PlatformUI;
import org.jboss.tools.common.meta.action.XActionItem;
import org.jboss.tools.common.meta.action.XActionList;
import org.jboss.tools.common.meta.action.XActionItem.Acceptor;
import org.jboss.tools.common.meta.help.HelpUtil;
-import org.jboss.tools.common.model.event.*;
+import org.jboss.tools.common.model.XModelObject;
+import org.jboss.tools.common.model.event.XModelTreeEvent;
+import org.jboss.tools.common.model.event.XModelTreeListener;
import org.jboss.tools.common.model.options.PreferenceModelUtilities;
+import org.jboss.tools.common.model.ui.ModelUIPlugin;
+import org.jboss.tools.common.model.ui.navigator.FilteredTreeContentProvider;
+import org.jboss.tools.common.model.ui.navigator.NavigatorLabelProvider;
+import org.jboss.tools.common.model.ui.navigator.TreeViewerMenuInvoker;
+import org.jboss.tools.common.model.ui.navigator.TreeViewerModelListenerImpl;
+import org.jboss.tools.common.model.ui.objecteditor.XModelObjectEditor;
+import org.jboss.tools.common.model.util.XModelTreeListenerSWTSync;
public class PaletteDialog extends Dialog {
protected TreeViewer treeViewer = null;
@@ -95,6 +101,7 @@
Control c = super.createContents(parent);
createEditorComponents((Composite)getDialogArea());
control = (Composite)c;
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, ModelUIPlugin.ID_PLUGIN + ".palette_editor");
return c;
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.doc.user/plugin.xml
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.doc.user/plugin.xml 2008-03-12 17:36:27 UTC (rev 6903)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.doc.user/plugin.xml 2008-03-12 18:01:33 UTC (rev 6904)
@@ -28,5 +28,9 @@
file="VPEContextHelp.xml"
plugin="org.jboss.tools.vpe">
</contexts>
+ <contexts
+ file="PaletteContextHelp.xml"
+ plugin="org.jboss.tools.common.model.ui.templates">
+ </contexts>
</extension>
</plugin>
16 years, 3 months
- 1
- 0
JBoss Tools SVN: r6903 - in trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui: wizard/addstruts and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2008-03-12 13:36:27 -0400 (Wed, 12 Mar 2008)
New Revision: 6903
Modified:
trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/IStrutsHelpContextIds.java
trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/wizard/addstruts/AddStrutsSupportWizard.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1692
Modified: trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/IStrutsHelpContextIds.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/IStrutsHelpContextIds.java 2008-03-12 17:28:10 UTC (rev 6902)
+++ trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/IStrutsHelpContextIds.java 2008-03-12 17:36:27 UTC (rev 6903)
@@ -22,4 +22,6 @@
public static final String IMPORT_STRUTS_PROJECT = PREFIX + "import_struts_project";
public static final String NEW_STRUTS_CONFIG = PREFIX + "new_struts_config";
+
+ public static final String ADD_STRUTS_SUPPORT = PREFIX + "add_struts_support";
}
Modified: trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/wizard/addstruts/AddStrutsSupportWizard.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/wizard/addstruts/AddStrutsSupportWizard.java 2008-03-12 17:28:10 UTC (rev 6902)
+++ trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/wizard/addstruts/AddStrutsSupportWizard.java 2008-03-12 17:36:27 UTC (rev 6903)
@@ -13,11 +13,14 @@
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.jface.wizard.WizardDialog;
+import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.PlatformUI;
import org.jboss.tools.common.model.ui.ModelUIImages;
import org.jboss.tools.jst.web.context.ImportWebDirProjectContext;
+import org.jboss.tools.struts.ui.IStrutsHelpContextIds;
import org.jboss.tools.struts.ui.StrutsUIPlugin;
public class AddStrutsSupportWizard extends Wizard {
@@ -34,6 +37,11 @@
return dialog.open();
}
+ public void createPageControls(Composite parent) {
+ super.createPageControls(parent);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, IStrutsHelpContextIds.ADD_STRUTS_SUPPORT);
+ }
+
public AddStrutsSupportWizard(ImportWebDirProjectContext context) {
this.context = context;
}
16 years, 3 months
- 1
- 0
JBoss Tools SVN: r6902 - in trunk/seam/plugins: org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2008-03-12 13:28:10 -0400 (Wed, 12 Mar 2008)
New Revision: 6902
Added:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/FileMapping.java
Removed:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamActionCreateOperation.java
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamActionWizard.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamBaseOperation.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamConversationWizard.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamEntityWizard.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamFormWizard.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizard.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1322 Added create.test property handling
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java 2008-03-12 16:54:42 UTC (rev 6901)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java 2008-03-12 17:28:10 UTC (rev 6902)
@@ -331,9 +331,11 @@
private Set<String> getVariablesNameByResource(IPath resourcePath) {
Set<ISeamContextVariable> variables = project.getVariablesByPath(resourcePath);
Set<String> result = new HashSet<String>();
- for (ISeamContextVariable variable : variables) {
- String name = variable.getName();
- result.add(name);
+ if(variables!=null) {
+ for (ISeamContextVariable variable : variables) {
+ String name = variable.getName();
+ result.add(name);
+ }
}
return result;
}
Added: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/FileMapping.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/FileMapping.java (rev 0)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/FileMapping.java 2008-03-12 17:28:10 UTC (rev 6902)
@@ -0,0 +1,93 @@
+ /*******************************************************************************
+ * Copyright (c) 2007 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:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.seam.ui.wizard;
+
+/**
+ * @author Alexey Kazakov
+ */
+public class FileMapping {
+
+ private String source;
+ private String destination;
+ private TYPE deployType;
+ private boolean test;
+
+ public static enum TYPE {
+ WAR("war"),
+ EAR("ear");
+
+ private String stringType;
+
+ private TYPE(String type) {
+ stringType = type;
+ }
+
+ @Override
+ public String toString() {
+ return stringType;
+ }
+
+ public boolean equalsString(String type) {
+ if(type==null) {
+ return false;
+ }
+ return stringType.equals(type);
+ }
+ }
+
+ public FileMapping(String source, String destination, TYPE deployType, boolean test) {
+ super();
+ this.source = source;
+ this.destination = destination;
+ this.deployType = deployType;
+ this.test = test;
+ }
+
+ public String getSource() {
+ return source;
+ }
+
+ public void setSource(String source) {
+ this.source = source;
+ }
+
+ public String getDestination() {
+ return destination;
+ }
+
+ public void setDestination(String destination) {
+ this.destination = destination;
+ }
+
+ public boolean isWar() {
+ return deployType == TYPE.WAR;
+ }
+
+ public boolean isEar() {
+ return deployType == TYPE.EAR;
+ }
+
+ public TYPE getDeployType() {
+ return deployType;
+ }
+
+ public void setDeployType(TYPE deployType) {
+ this.deployType = deployType;
+ }
+
+ public boolean isTest() {
+ return test;
+ }
+
+ public void setTest(boolean test) {
+ this.test = test;
+ }
+}
\ No newline at end of file
Deleted: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamActionCreateOperation.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamActionCreateOperation.java 2008-03-12 16:54:42 UTC (rev 6901)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamActionCreateOperation.java 2008-03-12 17:28:10 UTC (rev 6902)
@@ -1,76 +0,0 @@
-package org.jboss.tools.seam.ui.wizard;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.jboss.tools.seam.internal.core.project.facet.ISeamFacetDataModelProperties;
-import org.jboss.tools.seam.ui.SeamUIMessages;
-import org.jboss.tools.seam.ui.widget.editor.INamedElement;
-
-/**
- *
- * TODO move operations to core plugin
- */
-public class SeamActionCreateOperation extends SeamBaseOperation{
-
- /**
- * @param label
- */
- public SeamActionCreateOperation() {
- super((SeamUIMessages.SEAM_ACTION_WIZARD_ACTION_CREATING_OPERATION));
- }
-
- @Override
- public List<String[]> getFileMappings(Map<String, Object> vars) {
- if("war".equals(vars.get(ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS))) //$NON-NLS-1$
- return ACTION_WAR_MAPPING;
- else
- return ACTION_EAR_MAPPING;
- }
-
- public static final List<String[]> ACTION_WAR_MAPPING = new ArrayList<String[]>();
-
- public static final List<String[]> ACTION_EAR_MAPPING = new ArrayList<String[]>();
-
- static {
- // initialize war files mapping
- ACTION_WAR_MAPPING.add(new String[]{
- "${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/src/ActionJavaBean.java", //$NON-NLS-1$ //$NON-NLS-2$
- "${" + IParameter.SEAM_PROJECT_SRC_ACTION + "}/${" + ISeamFacetDataModelProperties.SESSION_BEAN_PACKAGE_PATH + "}/${" + IParameter.SEAM_LOCAL_INTERFACE_NAME +"}.java"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- ACTION_WAR_MAPPING.add(new String[]{
- "${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/test/ActionTest.java", //$NON-NLS-1$ //$NON-NLS-2$
- "${" + IParameter.SEAM_TEST_PROJECT_LOCATION_PATH + "}/test-src/${" + ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_PATH + "}/${"+ IParameter.SEAM_LOCAL_INTERFACE_NAME +"}Test.java"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- ACTION_WAR_MAPPING.add(new String[]{
- "${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/test/testng.xml", //$NON-NLS-1$ //$NON-NLS-2$
- "${" + IParameter.SEAM_TEST_PROJECT_LOCATION_PATH + "}/test-src/${" + ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_PATH + "}/${"+ IParameter.SEAM_LOCAL_INTERFACE_NAME +"}Test.xml"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- ACTION_WAR_MAPPING.add(new String[]{
- "${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/view/action.xhtml", //$NON-NLS-1$ //$NON-NLS-2$
- "${" + IParameter.SEAM_PROJECT_WEBCONTENT_PATH + "}/${" + IParameter.SEAM_PAGE_NAME +"}.xhtml"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-
- // initialize ear files mapping
- ACTION_EAR_MAPPING.add(new String[]{
- "${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/src/ActionBean.java", //$NON-NLS-1$ //$NON-NLS-2$
- "${" + IParameter.SEAM_PROJECT_SRC_ACTION + "}/${" + ISeamFacetDataModelProperties.SESSION_BEAN_PACKAGE_PATH + "}/${" + IParameter.SEAM_BEAN_NAME +"}.java"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- ACTION_EAR_MAPPING.add(new String[]{
- "${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/src/Action.java", //$NON-NLS-1$ //$NON-NLS-2$
- "${" + IParameter.SEAM_PROJECT_SRC_ACTION + "}/${" + ISeamFacetDataModelProperties.SESSION_BEAN_PACKAGE_PATH + "}/${" + IParameter.SEAM_LOCAL_INTERFACE_NAME +"}.java"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- ACTION_EAR_MAPPING.add(new String[]{
- "${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/test/ActionTest.java", //$NON-NLS-1$ //$NON-NLS-2$
- "${" + IParameter.SEAM_TEST_PROJECT_LOCATION_PATH + "}/test-src/${" + ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_PATH + "}/${"+ IParameter.SEAM_LOCAL_INTERFACE_NAME +"}Test.java"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- ACTION_EAR_MAPPING.add(new String[]{
- "${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/test/testng.xml", //$NON-NLS-1$ //$NON-NLS-2$
- "${" + IParameter.SEAM_TEST_PROJECT_LOCATION_PATH + "}/test-src/${" + ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_PATH + "}/${"+ IParameter.SEAM_LOCAL_INTERFACE_NAME +"}Test.xml"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- ACTION_EAR_MAPPING.add(ACTION_WAR_MAPPING.get(3));
- }
-
- /*
- * (non-Javadoc)
- * @see org.jboss.tools.seam.ui.wizard.SeamBaseOperation#getSessionBeanPackageName(org.eclipse.core.runtime.preferences.IEclipsePreferences, java.util.Map)
- */
- @Override
- protected String getSessionBeanPackageName(IEclipsePreferences seamFacetPrefs, Map<String, INamedElement> wizardParams) {
- return wizardParams.get(IParameter.SEAM_PACKAGE_NAME).getValue().toString();
- }
-}
\ No newline at end of file
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamActionWizard.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamActionWizard.java 2008-03-12 16:54:42 UTC (rev 6901)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamActionWizard.java 2008-03-12 17:28:10 UTC (rev 6902)
@@ -37,7 +37,6 @@
PlatformUI.getWorkbench().getHelpSystem().setHelp(pageContainer, ISeamHelpContextIds.NEW_SEAM_ACTION);
}
-
/**
*
*/
@@ -46,20 +45,20 @@
setWindowTitle(SeamUIMessages.SEAM_ACTION_WIZARD_NEW_SEAM_ACTION);
setDefaultPageImageDescriptor(ImageDescriptor.createFromFile(SeamActionWizard.class, "SeamFormWizBan.png")); //$NON-NLS-1$
}
-
+
@Override
public void addPages() {
addPage(new SeamActionWizardPage1(getInitialSelection()));
}
public static IUndoableOperation CREATE_SEAM_ACTION = new SeamActionCreateOperation();
-
+
/**
*
* TODO move operations to core plugin
*/
public static class SeamActionCreateOperation extends SeamBaseOperation{
-
+
/**
* @param label
*/
@@ -68,46 +67,61 @@
}
@Override
- public List<String[]> getFileMappings(Map<String, Object> vars) {
- if("war".equals(vars.get(ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS))) //$NON-NLS-1$
- return ACTION_WAR_MAPPING;
- else
- return ACTION_EAR_MAPPING;
+ public List<FileMapping> getFileMappings(Map<String, Object> vars) {
+ return ACTION_MAPPING;
}
- public static final List<String[]> ACTION_WAR_MAPPING = new ArrayList<String[]>();
+ public static final List<FileMapping> ACTION_MAPPING = new ArrayList<FileMapping>();
- public static final List<String[]> ACTION_EAR_MAPPING = new ArrayList<String[]>();
-
static {
// initialize war files mapping
- ACTION_WAR_MAPPING.add(new String[]{
+ ACTION_MAPPING.add(new FileMapping(
"${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/src/ActionJavaBean.java", //$NON-NLS-1$ //$NON-NLS-2$
- "${" + IParameter.SEAM_PROJECT_SRC_ACTION + "}/${" + ISeamFacetDataModelProperties.SESSION_BEAN_PACKAGE_PATH + "}/${" + IParameter.SEAM_LOCAL_INTERFACE_NAME +"}.java"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- ACTION_WAR_MAPPING.add(new String[]{
+ "${" + IParameter.SEAM_PROJECT_SRC_ACTION + "}/${" + ISeamFacetDataModelProperties.SESSION_BEAN_PACKAGE_PATH + "}/${" + IParameter.SEAM_LOCAL_INTERFACE_NAME +"}.java", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ FileMapping.TYPE.WAR,
+ false));
+ ACTION_MAPPING.add(new FileMapping(
"${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/test/ActionTest.java", //$NON-NLS-1$ //$NON-NLS-2$
- "${" + IParameter.TEST_SOURCE_FOLDER + "}/${" + ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_PATH + "}/${"+ IParameter.SEAM_LOCAL_INTERFACE_NAME +"}Test.java"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- ACTION_WAR_MAPPING.add(new String[]{
+ "${" + IParameter.TEST_SOURCE_FOLDER + "}/${" + ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_PATH + "}/${"+ IParameter.SEAM_LOCAL_INTERFACE_NAME +"}Test.java", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ FileMapping.TYPE.WAR,
+ true));
+ ACTION_MAPPING.add(new FileMapping(
"${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/test/testng.xml", //$NON-NLS-1$ //$NON-NLS-2$
- "${" + IParameter.TEST_SOURCE_FOLDER + "}/${" + ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_PATH + "}/${"+ IParameter.SEAM_LOCAL_INTERFACE_NAME +"}Test.xml"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- ACTION_WAR_MAPPING.add(new String[]{
+ "${" + IParameter.TEST_SOURCE_FOLDER + "}/${" + ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_PATH + "}/${"+ IParameter.SEAM_LOCAL_INTERFACE_NAME +"}Test.xml", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ FileMapping.TYPE.WAR,
+ true));
+ ACTION_MAPPING.add(new FileMapping(
"${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/view/action.xhtml", //$NON-NLS-1$ //$NON-NLS-2$
- "${" + IParameter.SEAM_PROJECT_WEBCONTENT_PATH + "}/${" + IParameter.SEAM_PAGE_NAME +"}.xhtml"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "${" + IParameter.SEAM_PROJECT_WEBCONTENT_PATH + "}/${" + IParameter.SEAM_PAGE_NAME +"}.xhtml", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ FileMapping.TYPE.WAR,
+ false));
// initialize ear files mapping
- ACTION_EAR_MAPPING.add(new String[]{
+ ACTION_MAPPING.add(new FileMapping(
"${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/src/ActionBean.java", //$NON-NLS-1$ //$NON-NLS-2$
- "${" + IParameter.SEAM_PROJECT_SRC_ACTION + "}/${" + ISeamFacetDataModelProperties.SESSION_BEAN_PACKAGE_PATH + "}/${" + IParameter.SEAM_BEAN_NAME +"}.java"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- ACTION_EAR_MAPPING.add(new String[]{
+ "${" + IParameter.SEAM_PROJECT_SRC_ACTION + "}/${" + ISeamFacetDataModelProperties.SESSION_BEAN_PACKAGE_PATH + "}/${" + IParameter.SEAM_BEAN_NAME +"}.java", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ FileMapping.TYPE.EAR,
+ false));
+ ACTION_MAPPING.add(new FileMapping(
"${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/src/Action.java", //$NON-NLS-1$ //$NON-NLS-2$
- "${" + IParameter.SEAM_PROJECT_SRC_ACTION + "}/${" + ISeamFacetDataModelProperties.SESSION_BEAN_PACKAGE_PATH + "}/${" + IParameter.SEAM_LOCAL_INTERFACE_NAME +"}.java"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- ACTION_EAR_MAPPING.add(new String[]{
+ "${" + IParameter.SEAM_PROJECT_SRC_ACTION + "}/${" + ISeamFacetDataModelProperties.SESSION_BEAN_PACKAGE_PATH + "}/${" + IParameter.SEAM_LOCAL_INTERFACE_NAME +"}.java", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ FileMapping.TYPE.EAR,
+ false));
+ ACTION_MAPPING.add(new FileMapping(
"${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/test/ActionTest.java", //$NON-NLS-1$ //$NON-NLS-2$
- "${" + IParameter.TEST_SOURCE_FOLDER + "}/${" + ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_PATH + "}/${"+ IParameter.SEAM_LOCAL_INTERFACE_NAME +"}Test.java"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- ACTION_EAR_MAPPING.add(new String[]{
+ "${" + IParameter.TEST_SOURCE_FOLDER + "}/${" + ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_PATH + "}/${"+ IParameter.SEAM_LOCAL_INTERFACE_NAME +"}Test.java", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ FileMapping.TYPE.EAR,
+ true));
+ ACTION_MAPPING.add(new FileMapping(
"${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/test/testng.xml", //$NON-NLS-1$ //$NON-NLS-2$
- "${" + IParameter.TEST_SOURCE_FOLDER + "}/${" + ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_PATH + "}/${"+ IParameter.SEAM_LOCAL_INTERFACE_NAME +"}Test.xml"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- ACTION_EAR_MAPPING.add(ACTION_WAR_MAPPING.get(3));
+ "${" + IParameter.TEST_SOURCE_FOLDER + "}/${" + ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_PATH + "}/${"+ IParameter.SEAM_LOCAL_INTERFACE_NAME +"}Test.xml", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ FileMapping.TYPE.EAR,
+ true));
+ ACTION_MAPPING.add(new FileMapping(
+ "${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/view/action.xhtml", //$NON-NLS-1$ //$NON-NLS-2$
+ "${" + IParameter.SEAM_PROJECT_WEBCONTENT_PATH + "}/${" + IParameter.SEAM_PAGE_NAME +"}.xhtml", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ FileMapping.TYPE.EAR,
+ false));
}
/*
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamBaseOperation.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamBaseOperation.java 2008-03-12 16:54:42 UTC (rev 6901)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamBaseOperation.java 2008-03-12 17:28:10 UTC (rev 6902)
@@ -42,6 +42,7 @@
import org.jboss.tools.seam.core.SeamCorePlugin;
import org.jboss.tools.seam.core.SeamProjectsSet;
import org.jboss.tools.seam.core.project.facet.SeamRuntimeManager;
+import org.jboss.tools.seam.internal.core.project.facet.ISeamFacetDataModelProperties;
import org.jboss.tools.seam.internal.core.project.facet.SeamFacetFilterSetFactory;
import org.jboss.tools.seam.ui.SeamGuiPlugin;
import org.jboss.tools.seam.ui.widget.editor.INamedElement;
@@ -107,7 +108,7 @@
vars.put(IParameter.ENTITY_BEAN_PACKAGE_PATH, entityFolder.replace('.','/'));
vars.put(IParameter.ENTITY_BEAN_PACKAGE_NAME, entityFolder);
- List<String[]> fileMapping = getFileMappings(vars);
+ List<FileMapping> fileMapping = getFileMappings(vars);
List<String[]> fileMappingCopy = applyVariables(fileMapping,vars);
FilterSetCollection filters = getFilterSetCollection(vars);
final File[] file = new File[fileMappingCopy.size()];
@@ -186,23 +187,25 @@
* @param vars
* @return
*/
- public static List<String[]> applyVariables(List<String[]> fileMapping,
- Map<String, Object> vars) {
+ public static List<String[]> applyVariables(List<FileMapping> fileMapping, Map<String, Object> vars) {
List<String[]> result = new ArrayList<String[]>();
- for (String[] filter : fileMapping) {
- String source = filter[0];
- for (Object property : vars.keySet()){
- if(source.contains("${"+property.toString()+"}")) { //$NON-NLS-1$ //$NON-NLS-2$
- source = source.replace("${"+property.toString()+"}",vars.get(property.toString()).toString()); //$NON-NLS-1$ //$NON-NLS-2$
+ for (FileMapping filter : fileMapping) {
+ if(filter.getDeployType().equalsString((String)vars.get(ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS)) &&
+ (!filter.isTest() || Boolean.parseBoolean(vars.get(ISeamFacetDataModelProperties.TEST_CREATING).toString()))) { //$NON-NLS-1$
+ String source = filter.getSource();
+ for (Object property : vars.keySet()){
+ if(source.contains("${"+property.toString()+"}")) { //$NON-NLS-1$ //$NON-NLS-2$
+ source = source.replace("${"+property.toString()+"}",vars.get(property.toString()).toString()); //$NON-NLS-1$ //$NON-NLS-2$
+ }
}
- }
- String dest = filter[1];
- for (Object property : vars.keySet()){
- if(dest.contains("${"+property.toString()+"}")) { //$NON-NLS-1$ //$NON-NLS-2$
- dest = dest.replace("${"+property.toString()+"}",vars.get(property.toString()).toString()); //$NON-NLS-1$ //$NON-NLS-2$
+ String dest = filter.getDestination();
+ for (Object property : vars.keySet()){
+ if(dest.contains("${"+property.toString()+"}")) { //$NON-NLS-1$ //$NON-NLS-2$
+ dest = dest.replace("${"+property.toString()+"}",vars.get(property.toString()).toString()); //$NON-NLS-1$ //$NON-NLS-2$
+ }
}
+ result.add(new String[]{source, dest});
}
- result.add(new String[]{source,dest});
}
return result;
}
@@ -211,7 +214,7 @@
* @param vars
* @return
*/
- public abstract List<String[]> getFileMappings(Map<String, Object> vars);
+ public abstract List<FileMapping> getFileMappings(Map<String, Object> vars);
/**
*
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamConversationWizard.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamConversationWizard.java 2008-03-12 16:54:42 UTC (rev 6901)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamConversationWizard.java 2008-03-12 17:28:10 UTC (rev 6902)
@@ -59,34 +59,40 @@
}
@Override
- public List<String[]> getFileMappings(Map<String, Object> vars) {
- if("war".equals(vars.get(ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS))) //$NON-NLS-1$
- return ACTION_WAR_MAPPING;
- else
- return ACTION_EAR_MAPPING;
+ public List<FileMapping> getFileMappings(Map<String, Object> vars) {
+ return ACTION_MAPPING;
}
- public static final List<String[]> ACTION_WAR_MAPPING = new ArrayList<String[]>();
+ public static final List<FileMapping> ACTION_MAPPING = new ArrayList<FileMapping>();
- public static final List<String[]> ACTION_EAR_MAPPING = new ArrayList<String[]>();
-
static {
// initialize war files mapping
- ACTION_WAR_MAPPING.add(new String[]{
+ ACTION_MAPPING.add(new FileMapping(
"${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/src/ConversationJavaBean.java", //$NON-NLS-1$ //$NON-NLS-2$
- "${" + IParameter.SEAM_PROJECT_SRC_ACTION + "}/${" + ISeamFacetDataModelProperties.SESSION_BEAN_PACKAGE_PATH + "}/${" + IParameter.SEAM_BEAN_NAME +"}.java"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- ACTION_WAR_MAPPING.add(new String[]{
+ "${" + IParameter.SEAM_PROJECT_SRC_ACTION + "}/${" + ISeamFacetDataModelProperties.SESSION_BEAN_PACKAGE_PATH + "}/${" + IParameter.SEAM_BEAN_NAME +"}.java", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ FileMapping.TYPE.WAR,
+ false));
+ ACTION_MAPPING.add(new FileMapping(
"${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/view/conversation.xhtml", //$NON-NLS-1$ //$NON-NLS-2$
- "${" + IParameter.SEAM_PROJECT_WEBCONTENT_PATH + "}/${" + IParameter.SEAM_PAGE_NAME +"}.xhtml"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-
+ "${" + IParameter.SEAM_PROJECT_WEBCONTENT_PATH + "}/${" + IParameter.SEAM_PAGE_NAME +"}.xhtml", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ FileMapping.TYPE.WAR,
+ false));
// initialize ear files mapping
- ACTION_EAR_MAPPING.add(new String[]{
+ ACTION_MAPPING.add(new FileMapping(
"${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/src/ConversationBean.java", //$NON-NLS-1$ //$NON-NLS-2$
- "${" + IParameter.SEAM_PROJECT_SRC_ACTION + "}/${" + ISeamFacetDataModelProperties.SESSION_BEAN_PACKAGE_PATH + "}/${" + IParameter.SEAM_BEAN_NAME +"}.java"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- ACTION_EAR_MAPPING.add(new String[]{
+ "${" + IParameter.SEAM_PROJECT_SRC_ACTION + "}/${" + ISeamFacetDataModelProperties.SESSION_BEAN_PACKAGE_PATH + "}/${" + IParameter.SEAM_BEAN_NAME +"}.java", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ FileMapping.TYPE.EAR,
+ false));
+ ACTION_MAPPING.add(new FileMapping(
"${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/src/Conversation.java", //$NON-NLS-1$ //$NON-NLS-2$
- "${" + IParameter.SEAM_PROJECT_SRC_ACTION + "}/${" + ISeamFacetDataModelProperties.SESSION_BEAN_PACKAGE_PATH + "}/${" + IParameter.SEAM_LOCAL_INTERFACE_NAME +"}.java"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- ACTION_EAR_MAPPING.add(ACTION_WAR_MAPPING.get(1));
+ "${" + IParameter.SEAM_PROJECT_SRC_ACTION + "}/${" + ISeamFacetDataModelProperties.SESSION_BEAN_PACKAGE_PATH + "}/${" + IParameter.SEAM_LOCAL_INTERFACE_NAME +"}.java", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ FileMapping.TYPE.EAR,
+ false));
+ ACTION_MAPPING.add(new FileMapping(
+ "${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/view/conversation.xhtml", //$NON-NLS-1$ //$NON-NLS-2$
+ "${" + IParameter.SEAM_PROJECT_WEBCONTENT_PATH + "}/${" + IParameter.SEAM_PAGE_NAME +"}.xhtml", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ FileMapping.TYPE.EAR,
+ false));
}
/*
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamEntityWizard.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamEntityWizard.java 2008-03-12 16:54:42 UTC (rev 6901)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamEntityWizard.java 2008-03-12 17:28:10 UTC (rev 6902)
@@ -31,11 +31,12 @@
*
*/
public class SeamEntityWizard extends SeamBaseWizard implements INewWizard {
-
+
public void createPageControls(Composite pageContainer) {
super.createPageControls(pageContainer);
PlatformUI.getWorkbench().getHelpSystem().setHelp(pageContainer, ISeamHelpContextIds.NEW_SEAM_ENTITY);
}
+
/**
*
*/
@@ -43,7 +44,6 @@
super(CREATE_SEAM_ENTITY);
setWindowTitle(SeamUIMessages.SEAM_ENTITY_WIZARD_NEW_SEAM_ENTITY);
setDefaultPageImageDescriptor(ImageDescriptor.createFromFile(SeamEntityWizard.class, "SeamWebProjectWizBan.png"));
-
}
@Override
@@ -79,37 +79,55 @@
}
@Override
- public List<String[]> getFileMappings(Map<String, Object> vars) {
- if("war".equals(vars.get(ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS))) //$NON-NLS-1$
- return ACTION_WAR_MAPPING;
- else
- return ACTION_EAR_MAPPING;
+ public List<FileMapping> getFileMappings(Map<String, Object> vars) {
+ return ACTION_MAPPING;
}
- public static final List<String[]> ACTION_WAR_MAPPING = new ArrayList<String[]>();
+ public static final List<FileMapping> ACTION_MAPPING = new ArrayList<FileMapping>();
- public static final List<String[]> ACTION_EAR_MAPPING = new ArrayList<String[]>();
-
static {
// initialize war files mapping
- ACTION_WAR_MAPPING.add(new String[]{
+ ACTION_MAPPING.add(new FileMapping(
"${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/src/Entity.java", //$NON-NLS-1$ //$NON-NLS-2$
- "${" + IParameter.SEAM_PROJECT_SRC_MODEL + "}/${" + ISeamFacetDataModelProperties.ENTITY_BEAN_PACKAGE_PATH + "}/${" + IParameter.SEAM_ENTITY_CLASS_NAME +"}.java"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- ACTION_WAR_MAPPING.add(new String[]{
+ "${" + IParameter.SEAM_PROJECT_SRC_MODEL + "}/${" + ISeamFacetDataModelProperties.ENTITY_BEAN_PACKAGE_PATH + "}/${" + IParameter.SEAM_ENTITY_CLASS_NAME +"}.java", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ FileMapping.TYPE.WAR,
+ false));
+ ACTION_MAPPING.add(new FileMapping(
"${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/src/EntityHome.java", //$NON-NLS-1$ //$NON-NLS-2$
- "${" + IParameter.SEAM_PROJECT_SRC_ACTION + "}/${" + ISeamFacetDataModelProperties.SESSION_BEAN_PACKAGE_PATH + "}/${" + IParameter.SEAM_ENTITY_CLASS_NAME +"}Home.java"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- ACTION_WAR_MAPPING.add(new String[]{
+ "${" + IParameter.SEAM_PROJECT_SRC_ACTION + "}/${" + ISeamFacetDataModelProperties.SESSION_BEAN_PACKAGE_PATH + "}/${" + IParameter.SEAM_ENTITY_CLASS_NAME +"}Home.java", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ FileMapping.TYPE.WAR,
+ false));
+ ACTION_MAPPING.add(new FileMapping(
"${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/src/EntityList.java", //$NON-NLS-1$ //$NON-NLS-2$
- "${" + IParameter.SEAM_PROJECT_SRC_ACTION + "}/${" + ISeamFacetDataModelProperties.SESSION_BEAN_PACKAGE_PATH + "}/${" + IParameter.SEAM_ENTITY_CLASS_NAME +"}List.java"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-
- ACTION_WAR_MAPPING.add(new String[]{
+ "${" + IParameter.SEAM_PROJECT_SRC_ACTION + "}/${" + ISeamFacetDataModelProperties.SESSION_BEAN_PACKAGE_PATH + "}/${" + IParameter.SEAM_ENTITY_CLASS_NAME +"}List.java", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ FileMapping.TYPE.WAR,
+ false));
+ // initialize ear files mapping
+ ACTION_MAPPING.add(new FileMapping(
"${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/view/edit.xhtml", //$NON-NLS-1$ //$NON-NLS-2$
- "${" + IParameter.SEAM_PROJECT_WEBCONTENT_PATH + "}/${" + IParameter.SEAM_PAGE_NAME +"}.xhtml"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- ACTION_WAR_MAPPING.add(new String[]{
+ "${" + IParameter.SEAM_PROJECT_WEBCONTENT_PATH + "}/${" + IParameter.SEAM_PAGE_NAME +"}.xhtml", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ FileMapping.TYPE.EAR,
+ false));
+ ACTION_MAPPING.add(new FileMapping(
"${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/view/list.xhtml", //$NON-NLS-1$ //$NON-NLS-2$
- "${" + IParameter.SEAM_PROJECT_WEBCONTENT_PATH + "}/${" + IParameter.SEAM_MASTER_PAGE_NAME +"}.xhtml"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-
- ACTION_EAR_MAPPING.addAll(ACTION_WAR_MAPPING);
+ "${" + IParameter.SEAM_PROJECT_WEBCONTENT_PATH + "}/${" + IParameter.SEAM_MASTER_PAGE_NAME +"}.xhtml", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ FileMapping.TYPE.EAR,
+ false));
+ ACTION_MAPPING.add(new FileMapping(
+ "${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/src/Entity.java", //$NON-NLS-1$ //$NON-NLS-2$
+ "${" + IParameter.SEAM_PROJECT_SRC_MODEL + "}/${" + ISeamFacetDataModelProperties.ENTITY_BEAN_PACKAGE_PATH + "}/${" + IParameter.SEAM_ENTITY_CLASS_NAME +"}.java", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ FileMapping.TYPE.EAR,
+ false));
+ ACTION_MAPPING.add(new FileMapping(
+ "${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/src/EntityHome.java", //$NON-NLS-1$ //$NON-NLS-2$
+ "${" + IParameter.SEAM_PROJECT_SRC_ACTION + "}/${" + ISeamFacetDataModelProperties.SESSION_BEAN_PACKAGE_PATH + "}/${" + IParameter.SEAM_ENTITY_CLASS_NAME +"}Home.java", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ FileMapping.TYPE.EAR,
+ false));
+ ACTION_MAPPING.add(new FileMapping(
+ "${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/src/EntityList.java", //$NON-NLS-1$ //$NON-NLS-2$
+ "${" + IParameter.SEAM_PROJECT_SRC_ACTION + "}/${" + ISeamFacetDataModelProperties.SESSION_BEAN_PACKAGE_PATH + "}/${" + IParameter.SEAM_ENTITY_CLASS_NAME +"}List.java", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ FileMapping.TYPE.EAR,
+ false));
}
/*
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamFormWizard.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamFormWizard.java 2008-03-12 16:54:42 UTC (rev 6901)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamFormWizard.java 2008-03-12 17:28:10 UTC (rev 6902)
@@ -10,7 +10,6 @@
******************************************************************************/
package org.jboss.tools.seam.ui.wizard;
-import java.io.File;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -32,11 +31,12 @@
*
*/
public class SeamFormWizard extends SeamBaseWizard implements INewWizard {
-
+
public void createPageControls(Composite pageContainer) {
super.createPageControls(pageContainer);
PlatformUI.getWorkbench().getHelpSystem().setHelp(pageContainer, ISeamHelpContextIds.NEW_SEAM_FORM);
}
+
/**
*
*/
@@ -44,9 +44,12 @@
super(CREATE_SEAM_FORM);
setWindowTitle(SeamUIMessages.SEAM_FORM_WIZARD_NEW_SEAM_FORM);
setDefaultPageImageDescriptor(ImageDescriptor.createFromFile(SeamActionWizard.class, "SeamFormWizBan.png")); //$NON-NLS-1$
-
}
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.jface.wizard.Wizard#addPages()
+ */
@Override
public void addPages() {
addPage(new SeamFormWizardPage1(getInitialSelection()));
@@ -60,49 +63,65 @@
super(SeamUIMessages.SEAM_FORM_WIZARD_FORM_CREATING_OPERATION);
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
* @see org.jboss.tools.seam.ui.wizard.SeamBaseOperation#getFileMappings(java.util.Map)
*/
@Override
- public List<String[]> getFileMappings(Map<String, Object> vars) {
- if("war".equals(vars.get(ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS))) //$NON-NLS-1$
- return FORM_WAR_MAPPING;
- else
- return FORM_EAR_MAPPING;
+ public List<FileMapping> getFileMappings(Map<String, Object> vars) {
+ return ACTION_MAPPING;
}
- public static final List<String[]> FORM_WAR_MAPPING = new ArrayList<String[]>();
+ public static final List<FileMapping> ACTION_MAPPING = new ArrayList<FileMapping>();
- public static final List<String[]> FORM_EAR_MAPPING = new ArrayList<String[]>();
-
static {
- FORM_WAR_MAPPING.add(new String[]{
+ // initialize war files mapping
+ ACTION_MAPPING.add(new FileMapping(
"${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/src/FormActionJavaBean.java", //$NON-NLS-1$ //$NON-NLS-2$
- "${" + IParameter.SEAM_PROJECT_SRC_ACTION + "}/${" + ISeamFacetDataModelProperties.SESSION_BEAN_PACKAGE_PATH + "}/${" + IParameter.SEAM_LOCAL_INTERFACE_NAME +"}.java"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- FORM_WAR_MAPPING.add(new String[]{
+ "${" + IParameter.SEAM_PROJECT_SRC_ACTION + "}/${" + ISeamFacetDataModelProperties.SESSION_BEAN_PACKAGE_PATH + "}/${" + IParameter.SEAM_LOCAL_INTERFACE_NAME +"}.java", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ FileMapping.TYPE.WAR,
+ false));
+ ACTION_MAPPING.add(new FileMapping(
"${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/test/FormTest.java", //$NON-NLS-1$ //$NON-NLS-2$
- "${" + IParameter.TEST_SOURCE_FOLDER + "}/${" + ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_PATH + "}/${"+ IParameter.SEAM_LOCAL_INTERFACE_NAME +"}Test.java"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- FORM_WAR_MAPPING.add(new String[]{
+ "${" + IParameter.TEST_SOURCE_FOLDER + "}/${" + ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_PATH + "}/${"+ IParameter.SEAM_LOCAL_INTERFACE_NAME +"}Test.java", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ FileMapping.TYPE.WAR,
+ true));
+ ACTION_MAPPING.add(new FileMapping(
"${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/test/testng.xml", //$NON-NLS-1$ //$NON-NLS-2$
- "${" + IParameter.TEST_SOURCE_FOLDER + "}/${" + ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_PATH + "}/${"+ IParameter.SEAM_LOCAL_INTERFACE_NAME +"}Test.xml"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- FORM_WAR_MAPPING.add(new String[]{
+ "${" + IParameter.TEST_SOURCE_FOLDER + "}/${" + ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_PATH + "}/${"+ IParameter.SEAM_LOCAL_INTERFACE_NAME +"}Test.xml", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ FileMapping.TYPE.WAR,
+ true));
+ ACTION_MAPPING.add(new FileMapping(
"${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/view/form.xhtml", //$NON-NLS-1$ //$NON-NLS-2$
- "${" + IParameter.SEAM_PROJECT_WEBCONTENT_PATH + "}/${" + IParameter.SEAM_PAGE_NAME +"}.xhtml"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-
+ "${" + IParameter.SEAM_PROJECT_WEBCONTENT_PATH + "}/${" + IParameter.SEAM_PAGE_NAME +"}.xhtml", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ FileMapping.TYPE.WAR,
+ false));
// initialize ear files mapping
- FORM_EAR_MAPPING.add(new String[]{
+ ACTION_MAPPING.add(new FileMapping(
"${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/src/FormActionBean.java", //$NON-NLS-1$ //$NON-NLS-2$
- "${" + IParameter.SEAM_PROJECT_SRC_ACTION + "}/${" + ISeamFacetDataModelProperties.SESSION_BEAN_PACKAGE_PATH + "}/${" + IParameter.SEAM_BEAN_NAME +"}.java"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- FORM_EAR_MAPPING.add(new String[]{
+ "${" + IParameter.SEAM_PROJECT_SRC_ACTION + "}/${" + ISeamFacetDataModelProperties.SESSION_BEAN_PACKAGE_PATH + "}/${" + IParameter.SEAM_BEAN_NAME +"}.java", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ FileMapping.TYPE.EAR,
+ false));
+ ACTION_MAPPING.add(new FileMapping(
"${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/src/FormAction.java", //$NON-NLS-1$ //$NON-NLS-2$
- "${" + IParameter.SEAM_PROJECT_SRC_ACTION + "}/${" + ISeamFacetDataModelProperties.SESSION_BEAN_PACKAGE_PATH + "}/${" + IParameter.SEAM_LOCAL_INTERFACE_NAME +"}.java"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- FORM_EAR_MAPPING.add(new String[]{
+ "${" + IParameter.SEAM_PROJECT_SRC_ACTION + "}/${" + ISeamFacetDataModelProperties.SESSION_BEAN_PACKAGE_PATH + "}/${" + IParameter.SEAM_LOCAL_INTERFACE_NAME +"}.java", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ FileMapping.TYPE.EAR,
+ false));
+ ACTION_MAPPING.add(new FileMapping(
"${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/test/FormTest.java", //$NON-NLS-1$ //$NON-NLS-2$
- "${" + IParameter.TEST_SOURCE_FOLDER + "}/${" + ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_PATH + "}/${"+ IParameter.SEAM_LOCAL_INTERFACE_NAME +"}Test.java"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- FORM_EAR_MAPPING.add(new String[]{
+ "${" + IParameter.TEST_SOURCE_FOLDER + "}/${" + ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_PATH + "}/${"+ IParameter.SEAM_LOCAL_INTERFACE_NAME +"}Test.java", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ FileMapping.TYPE.EAR,
+ true));
+ ACTION_MAPPING.add(new FileMapping(
"${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/test/testng.xml", //$NON-NLS-1$ //$NON-NLS-2$
- "${" + IParameter.TEST_SOURCE_FOLDER + "}/${" + ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_PATH + "}/${"+ IParameter.SEAM_LOCAL_INTERFACE_NAME +"}Test.xml"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- FORM_EAR_MAPPING.add(FORM_WAR_MAPPING.get(3));
+ "${" + IParameter.TEST_SOURCE_FOLDER + "}/${" + ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_PATH + "}/${"+ IParameter.SEAM_LOCAL_INTERFACE_NAME +"}Test.xml", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ FileMapping.TYPE.EAR,
+ true));
+ ACTION_MAPPING.add(new FileMapping(
+ "${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/view/form.xhtml", //$NON-NLS-1$ //$NON-NLS-2$
+ "${" + IParameter.SEAM_PROJECT_WEBCONTENT_PATH + "}/${" + IParameter.SEAM_PAGE_NAME +"}.xhtml", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ FileMapping.TYPE.EAR,
+ false));
}
/*
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizard.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizard.java 2008-03-12 16:54:42 UTC (rev 6901)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizard.java 2008-03-12 17:28:10 UTC (rev 6902)
@@ -50,12 +50,12 @@
* @author Alexey Kazakov
*/
public class SeamGenerateEnitiesWizard extends SeamBaseWizard implements INewWizard {
-
+
public void createPageControls(Composite pageContainer) {
super.createPageControls(pageContainer);
PlatformUI.getWorkbench().getHelpSystem().setHelp(pageContainer, ISeamHelpContextIds.GENERATE_SEAM_ENTITIES);
}
-
+
public SeamGenerateEnitiesWizard() {
super(GENERATE_SEAM_ENTITIES);
setWindowTitle(SeamUIMessages.GENERATE_SEAM_ENTITIES_WIZARD_TITLE);
@@ -65,6 +65,10 @@
public static final IUndoableOperation GENERATE_SEAM_ENTITIES = new SeamBaseOperation(SeamUIMessages.SEAM_GENERATE_ENTITIES_WIZARD_ACTION_CREATING_OPERATION) {
+ /*
+ * (non-Javadoc)
+ * @see org.jboss.tools.seam.ui.wizard.SeamBaseOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
+ */
@Override
public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
Map<String, String> params = (Map)info.getAdapter(Map.class);
@@ -119,7 +123,7 @@
// Create exporters
// TODO Add others exporters
List<String> exporters = new ArrayList<String>();
-
+
if(isReverseEngineer) {
exporters.add("hbmtemplate0"); //$NON-NLS-1$
}
@@ -132,14 +136,14 @@
exporters.add("hbmtemplate7"); //$NON-NLS-1$
exporters.add("hbmtemplate8"); //$NON-NLS-1$
exporters.add("hbmtemplate9"); //$NON-NLS-1$
-
+
wc.setAttribute(HibernateLaunchConstants.ATTR_EXPORTERS, exporters);
-
+
if(isReverseEngineer) {
wc.setAttribute(HibernateLaunchConstants.ATTR_EXPORTERS + ".hbmtemplate0", true); //$NON-NLS-1$
wc.setAttribute(HibernateLaunchConstants.ATTR_EXPORTERS + ".hbmtemplate0.extension_id", "org.hibernate.tools.hbm2java"); //$NON-NLS-1$ //$NON-NLS-2$
}
-
+
wc.setAttribute(HibernateLaunchConstants.ATTR_EXPORTERS + ".hbmtemplate1", true); //$NON-NLS-1$
wc.setAttribute(HibernateLaunchConstants.ATTR_EXPORTERS + ".hbmtemplate1.extension_id", "org.hibernate.tools.hbmtemplate"); //$NON-NLS-1$ //$NON-NLS-2$
wc.setAttribute(HibernateLaunchConstants.ATTR_EXPORTERS + ".hbmtemplate2", true); //$NON-NLS-1$
@@ -308,8 +312,12 @@
return Status.OK_STATUS;
}
+ /*
+ * (non-Javadoc)
+ * @see org.jboss.tools.seam.ui.wizard.SeamBaseOperation#getFileMappings(java.util.Map)
+ */
@Override
- public List<String[]> getFileMappings(Map<String, Object> vars) {
+ public List<FileMapping> getFileMappings(Map<String, Object> vars) {
throw new UnsupportedOperationException(SeamUIMessages.SEAM_GENERATE_ENTITIES_WIZARD_THIS_METHOD_IS_NOT_RELEVANT_IN_GENERATING_SEAM_ENTITIES);
}
};
16 years, 3 months
- 1
- 0
JBoss Tools SVN: r6901 - in trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui: wizard/newfile and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2008-03-12 12:54:42 -0400 (Wed, 12 Mar 2008)
New Revision: 6901
Modified:
trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/IStrutsHelpContextIds.java
trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/wizard/newfile/NewStrutsConfigFileWizard.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1692
Modified: trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/IStrutsHelpContextIds.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/IStrutsHelpContextIds.java 2008-03-12 16:12:16 UTC (rev 6900)
+++ trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/IStrutsHelpContextIds.java 2008-03-12 16:54:42 UTC (rev 6901)
@@ -20,4 +20,6 @@
public static final String NEW_STRUTS_PROJECT = PREFIX + "new_struts_project";
public static final String IMPORT_STRUTS_PROJECT = PREFIX + "import_struts_project";
+
+ public static final String NEW_STRUTS_CONFIG = PREFIX + "new_struts_config";
}
Modified: trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/wizard/newfile/NewStrutsConfigFileWizard.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/wizard/newfile/NewStrutsConfigFileWizard.java 2008-03-12 16:12:16 UTC (rev 6900)
+++ trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/wizard/newfile/NewStrutsConfigFileWizard.java 2008-03-12 16:54:42 UTC (rev 6901)
@@ -10,7 +10,10 @@
******************************************************************************/
package org.jboss.tools.struts.ui.wizard.newfile;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.PlatformUI;
import org.jboss.tools.common.model.ui.wizard.newfile.*;
+import org.jboss.tools.struts.ui.IStrutsHelpContextIds;
public class NewStrutsConfigFileWizard extends NewFileWizardEx {
@@ -24,4 +27,8 @@
return new NewStrutsConfigFileContext(getVersion());
}
+ public void createPageControls(Composite parent) {
+ super.createPageControls(parent);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, IStrutsHelpContextIds.NEW_STRUTS_CONFIG);
+ }
}
16 years, 3 months
- 1
- 0
JBoss Tools SVN: r6900 - in trunk/jsf/plugins: org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2008-03-12 12:12:16 -0400 (Wed, 12 Mar 2008)
New Revision: 6900
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.doc.user/JSFContextHelp.xml
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/IJSFHelpContextIds.java
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wizard/project/ImportProjectWizard.java
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wizard/project/NewProjectWizard.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1692
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.doc.user/JSFContextHelp.xml
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.doc.user/JSFContextHelp.xml 2008-03-12 16:07:38 UTC (rev 6899)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.doc.user/JSFContextHelp.xml 2008-03-12 16:12:16 UTC (rev 6900)
@@ -21,10 +21,6 @@
<description>New Managed Bean Wizard</description>
<topic href="JSFStrutsTools.html#ManagedBeans96453" label="Managed Beans"/>
</context>
- <context id="new_managed_bean" title="New Managed Bean">
- <description>New Managed Bean Wizard</description>
- <topic href="JSFStrutsTools.html#ManagedBeans96453" label="Managed Beans"/>
- </context>
<context id="add_property" title="Add Property">
<description>Add Property Wizard</description>
<topic href="JSFStrutsTools.html#CodeGenerationForManagedBeans421" label="Code Generation for Managed Beans"/>
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/IJSFHelpContextIds.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/IJSFHelpContextIds.java 2008-03-12 16:07:38 UTC (rev 6899)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/IJSFHelpContextIds.java 2008-03-12 16:12:16 UTC (rev 6900)
@@ -14,6 +14,8 @@
public static final String PREFIX = JsfUiPlugin.PLUGIN_ID + '.';
public static final String FACES_CONFIG_EDITOR = PREFIX + "faces_config_editor";
+
+ public static final String NEW_JSF_PROJECT = PREFIX + "new_jsf_project";
-
+ public static final String IMPORT_JSF_PROJECT = PREFIX + "import_jsf_project";
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wizard/project/ImportProjectWizard.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wizard/project/ImportProjectWizard.java 2008-03-12 16:07:38 UTC (rev 6899)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wizard/project/ImportProjectWizard.java 2008-03-12 16:12:16 UTC (rev 6900)
@@ -11,8 +11,11 @@
package org.jboss.tools.jsf.ui.wizard.project;
import org.eclipse.jface.operation.IRunnableWithProgress;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.PlatformUI;
import org.jboss.tools.common.meta.key.WizardKeys;
import org.jboss.tools.common.model.XModelFactory;
+import org.jboss.tools.jsf.ui.IJSFHelpContextIds;
import org.jboss.tools.jsf.ui.operation.JSFProjectAdoptOperation;
import org.jboss.tools.jsf.web.helpers.context.*;
import org.jboss.tools.common.model.ui.*;
@@ -27,6 +30,11 @@
this.setDefaultPageImageDescriptor(ModelUIImages.getImageDescriptor(ModelUIImages.WIZARD_IMPORT_PROJECT));
}
+ public void createPageControls(Composite parent) {
+ super.createPageControls(parent);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, IJSFHelpContextIds.IMPORT_JSF_PROJECT);
+ }
+
public void addPages() {
context = new ImportProjectWizardContext(XModelFactory.getDefaultInstance().getRoot());
context.setInitialName(initialName);
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wizard/project/NewProjectWizard.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wizard/project/NewProjectWizard.java 2008-03-12 16:07:38 UTC (rev 6899)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wizard/project/NewProjectWizard.java 2008-03-12 16:12:16 UTC (rev 6900)
@@ -12,13 +12,15 @@
import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.jface.wizard.IWizardPage;
-
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.PlatformUI;
import org.jboss.tools.common.meta.key.WizardKeys;
+import org.jboss.tools.common.model.ui.ModelUIImages;
import org.jboss.tools.jsf.JSFPreference;
-import org.jboss.tools.jst.web.project.helpers.ProjectTemplate;
+import org.jboss.tools.jsf.ui.IJSFHelpContextIds;
import org.jboss.tools.jsf.ui.operation.JSFProjectCreationOperation;
import org.jboss.tools.jsf.web.helpers.context.NewProjectWizardContext;
-import org.jboss.tools.common.model.ui.ModelUIImages;
+import org.jboss.tools.jst.web.project.helpers.ProjectTemplate;
import org.jboss.tools.jst.web.ui.wizards.appregister.NewProjectRegisterPage;
import org.jboss.tools.jst.web.ui.wizards.project.NewWebProjectWizard;
import org.jboss.tools.jst.web.ui.wizards.project.NewWebProjectWizardPreprocessingPage;
@@ -36,6 +38,11 @@
this.setDefaultPageImageDescriptor(ModelUIImages.getImageDescriptor(ModelUIImages.WIZARD_NEW_PROJECT));
}
+ public void createPageControls(Composite parent) {
+ super.createPageControls(parent);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, IJSFHelpContextIds.NEW_JSF_PROJECT);
+ }
+
public void addPages() {
fMainPage = new NewProjectWizardPage(context);
fMainPage.setTitle(WizardKeys.getString(NEW_JSF_PROJECT_WIZARD_CREATE_STRUTS_PROJECT));
16 years, 3 months
- 1
- 0
JBoss Tools SVN: r6899 - in trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui: wizard/project and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2008-03-12 12:07:38 -0400 (Wed, 12 Mar 2008)
New Revision: 6899
Modified:
trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/IStrutsHelpContextIds.java
trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/wizard/project/ImportProjectWizard.java
trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/wizard/project/NewProjectWizard.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1692
Modified: trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/IStrutsHelpContextIds.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/IStrutsHelpContextIds.java 2008-03-12 16:06:17 UTC (rev 6898)
+++ trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/IStrutsHelpContextIds.java 2008-03-12 16:07:38 UTC (rev 6899)
@@ -17,5 +17,7 @@
public static final String VALIDATION_EDITOR = PREFIX + "validation_editor";
+ public static final String NEW_STRUTS_PROJECT = PREFIX + "new_struts_project";
+ public static final String IMPORT_STRUTS_PROJECT = PREFIX + "import_struts_project";
}
Modified: trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/wizard/project/ImportProjectWizard.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/wizard/project/ImportProjectWizard.java 2008-03-12 16:06:17 UTC (rev 6898)
+++ trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/wizard/project/ImportProjectWizard.java 2008-03-12 16:07:38 UTC (rev 6899)
@@ -12,8 +12,11 @@
import org.jboss.tools.common.model.ui.util.ModelUtilities;
import org.eclipse.jface.operation.IRunnableWithProgress;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.PlatformUI;
import org.jboss.tools.common.meta.key.WizardKeys;
import org.jboss.tools.common.model.ui.ModelUIImages;
+import org.jboss.tools.struts.ui.IStrutsHelpContextIds;
import org.jboss.tools.struts.ui.operation.StrutsProjectAdoptOperation;
import org.jboss.tools.jst.web.ui.wizards.project.ImportWebProjectWizard;
import org.jboss.tools.struts.webprj.model.helpers.context.ImportProjectWizardContext;
@@ -30,6 +33,11 @@
this.setDefaultPageImageDescriptor(ModelUIImages.getImageDescriptor(ModelUIImages.WIZARD_IMPORT_PROJECT));
}
+ public void createPageControls(Composite parent) {
+ super.createPageControls(parent);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, IStrutsHelpContextIds.IMPORT_STRUTS_PROJECT);
+ }
+
public void addPages() {
context = new ImportProjectWizardContext(ModelUtilities.getPreferenceModel().getRoot());
context.setInitialName(initialName);
Modified: trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/wizard/project/NewProjectWizard.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/wizard/project/NewProjectWizard.java 2008-03-12 16:06:17 UTC (rev 6898)
+++ trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/wizard/project/NewProjectWizard.java 2008-03-12 16:07:38 UTC (rev 6899)
@@ -12,10 +12,13 @@
import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.jface.wizard.IWizardPage;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.PlatformUI;
import org.jboss.tools.common.meta.key.WizardKeys;
import org.jboss.tools.common.model.ui.ModelUIImages;
import org.jboss.tools.jst.web.project.helpers.ProjectTemplate;
+import org.jboss.tools.struts.ui.IStrutsHelpContextIds;
import org.jboss.tools.struts.ui.operation.StrutsProjectCreationOperation;
import org.jboss.tools.jst.web.WebPreference;
import org.jboss.tools.jst.web.ui.wizards.appregister.NewProjectRegisterPage;
@@ -36,6 +39,11 @@
this.setDefaultPageImageDescriptor(ModelUIImages.getImageDescriptor(ModelUIImages.WIZARD_NEW_PROJECT));
}
+ public void createPageControls(Composite parent) {
+ super.createPageControls(parent);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, IStrutsHelpContextIds.NEW_STRUTS_PROJECT);
+ }
+
public void addPages() {
fMainPage = new NewProjectWizardPage(context);
fMainPage.setTitle(WizardKeys.getString(NEW_STRUTS_PROJECT_WIZARD_CREATE_STRUTS_PROJECT));
16 years, 3 months
- 1
- 0
JBoss Tools SVN: r6898 - trunk/jst/plugins/org.jboss.tools.jst.web/resources/help.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-03-12 12:06:17 -0400 (Wed, 12 Mar 2008)
New Revision: 6898
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web/resources/help/keys-web.properties
Log:
JBIDE-1895
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/resources/help/keys-web.properties
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/resources/help/keys-web.properties 2008-03-12 15:45:59 UTC (rev 6897)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/resources/help/keys-web.properties 2008-03-12 16:06:17 UTC (rev 6898)
@@ -694,10 +694,9 @@
WebAppJspConfig_Properties.Title=JSP Config
##### jsp property group #####
-WebAppJspPropertyGroup=/struts/noHelpYet.html
-WebAppJspPropertyGroup_Properties=/struts/noHelpYet.html
-WebAppJspPropertyGroup_Properties.WindowTitle=Properties
-WebAppJspPropertyGroup_Properties.Title=JSP Property Group
+WebAppJSPPropertyGroup_Properties=/struts/noHelpYet.html
+WebAppJSPPropertyGroup_Properties.WindowTitle=Properties
+WebAppJSPPropertyGroup_Properties.Title=JSP Property Group
##### service ref #####
WebAppServiceRef=/struts/noHelpYet.html
16 years, 3 months
- 1
- 0