JBoss Tools SVN: r19778 - in trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe: editor/wizards and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2010-01-15 11:17:29 -0500 (Fri, 15 Jan 2010)
New Revision: 19778
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAnyData.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateData.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/wizards/ExportUnknownTagsTemplatesWizardPage.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/wizards/ImportUnknownTagsTemplatesWizardPage.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties
Log:
https://jira.jboss.org/jira/browse/JBIDE-2795, import/export wizards were updated.
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAnyData.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAnyData.java 2010-01-15 16:08:11 UTC (rev 19777)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAnyData.java 2010-01-15 16:17:29 UTC (rev 19778)
@@ -85,4 +85,51 @@
this.style = style;
}
+
+ @Override
+ public String toString() {
+ return "VpeAnyData [name=" + super.getName() + ", uri=" + uri //$NON-NLS-1$ //$NON-NLS-2$
+ + ", tagForDisplay=" + tagForDisplay + ", value=" + value //$NON-NLS-1$ //$NON-NLS-2$
+ + ", style=" + style + "]"; //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = super.hashCode();
+ result = prime * result
+ + ((tagForDisplay == null) ? 0 : tagForDisplay.hashCode());
+ result = prime * result + ((uri == null) ? 0 : uri.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+ if (!super.equals(obj)) {
+ return false;
+ }
+ if (getClass() != obj.getClass()) {
+ return false;
+ }
+ VpeAnyData other = (VpeAnyData) obj;
+ if (tagForDisplay == null) {
+ if (other.tagForDisplay != null) {
+ return false;
+ }
+ } else if (!tagForDisplay.equals(other.tagForDisplay)) {
+ return false;
+ }
+ if (uri == null) {
+ if (other.uri != null) {
+ return false;
+ }
+ } else if (!uri.equals(other.uri)) {
+ return false;
+ }
+ return true;
+ }
+
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateData.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateData.java 2010-01-15 16:08:11 UTC (rev 19777)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateData.java 2010-01-15 16:17:29 UTC (rev 19778)
@@ -76,4 +76,42 @@
}
return null;
}
+
+ @Override
+ public String toString() {
+ return "VpeTemplateData [caseSensitive=" + caseSensitive + ", changed=" //$NON-NLS-1$ //$NON-NLS-2$
+ + changed + ", children=" + children + ", modify=" + modify //$NON-NLS-1$ //$NON-NLS-2$
+ + ", name=" + name + "]"; //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((name == null) ? 0 : name.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+ if (obj == null) {
+ return false;
+ }
+ if (getClass() != obj.getClass()) {
+ return false;
+ }
+ VpeTemplateData other = (VpeTemplateData) obj;
+ if (name == null) {
+ if (other.name != null) {
+ return false;
+ }
+ } else if (!name.equals(other.name)) {
+ return false;
+ }
+ return true;
+ }
+
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/wizards/ExportUnknownTagsTemplatesWizardPage.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/wizards/ExportUnknownTagsTemplatesWizardPage.java 2010-01-15 16:08:11 UTC (rev 19777)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/wizards/ExportUnknownTagsTemplatesWizardPage.java 2010-01-15 16:17:29 UTC (rev 19778)
@@ -47,6 +47,7 @@
import org.eclipse.ui.dialogs.WizardExportResourcesPage;
import org.jboss.tools.vpe.editor.template.VpeAnyData;
import org.jboss.tools.vpe.editor.template.VpeTemplateManager;
+import org.jboss.tools.vpe.editor.util.Constants;
import org.jboss.tools.vpe.messages.VpeUIMessages;
import org.jboss.tools.vpe.resref.core.ReferenceWizardPage;
@@ -58,21 +59,17 @@
public class ExportUnknownTagsTemplatesWizardPage extends WizardExportResourcesPage {
private static final String[] COLUMNS_NAMES = new String[] {
- "", //$NON-NLS-1$
VpeUIMessages.TemplatesTableProvider_TagName,
VpeUIMessages.TemplatesTableProvider_TagForDisplay,
VpeUIMessages.TemplatesTableProvider_URI,
VpeUIMessages.TemplatesTableProvider_Children};
private static final int[] COLUMNS_WIDTHS = new int[] {
- 15, 50, 50, 90, 30
+ 50, 50, 90, 40
};
private String pathString;
private Table tagsTable;
-// private TableViewer tableViewer;
private List<VpeAnyData> tagsList;
- private Button selectAllButton;
- private Button deselectAllButton;
/**
* Constructor
@@ -109,11 +106,10 @@
tagsTable = new Table(composite, SWT.BORDER);
TableLayout layout = new TableLayout();
tagsTable.setLayout(layout);
- tagsTable.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, 2));
+ tagsTable.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 2, 1));
tagsTable.setHeaderVisible(true);
tagsTable.setLinesVisible(true);
-// tableViewer = new TableViewer(tagsTable, SWT.MULTI | SWT.H_SCROLL
-// | SWT.V_SCROLL | SWT.FULL_SELECTION);
+
/*
* Create columns in the table
*/
@@ -128,44 +124,12 @@
* Fill the table with stored tags
*/
updateTagsTable();
- /*
- * Adding checkbox to the first column
- */
-// CellEditor[] cellEditors = { new CheckboxCellEditor(tagsTable),
-// new TextCellEditor(tagsTable), new TextCellEditor(tagsTable),
-// new TextCellEditor(tagsTable), new TextCellEditor(tagsTable) };
-// tableViewer.setCellEditors(cellEditors);
-// tableViewer.refresh();
/*
- * Add buttons
- */
- selectAllButton = new Button(composite, SWT.NONE);
- selectAllButton.setLayoutData(new GridData(SWT.LEFT, SWT.TOP, false, false, 1, 1));
- selectAllButton.setText(VpeUIMessages.SELECT_ALL);
-
- deselectAllButton = new Button(composite, SWT.NONE);
- deselectAllButton.setLayoutData(new GridData(SWT.LEFT, SWT.TOP, false, false, 1, 1));
- deselectAllButton.setText(VpeUIMessages.DESELECT_ALL);
-
- /*
- * Make buttons equal size
- */
-// selectAllButton.setSize(deselectAllButton.computeSize(SWT.DEFAULT, SWT.DEFAULT));
-
- /*
- * Adding event listeners to the buttons
- */
- selectAllButton.addListener(SWT.Modify, this);
- selectAllButton.addListener(SWT.Selection, this);
- deselectAllButton.addListener(SWT.Modify, this);
- deselectAllButton.addListener(SWT.Selection, this);
-
- /*
* Add path output and browse button
*/
final Text pathText = new Text(composite, SWT.BORDER);
- pathText.setLayoutData(new GridData(SWT.FILL, SWT.NONE, true, false, 1, 1));
+ pathText.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false, 1, 1));
pathText.addModifyListener(new ModifyListener() {
public void modifyText(ModifyEvent e) {
pathString = ((Text)e.getSource()).getText();
@@ -175,7 +139,7 @@
Button browseButton = new Button(composite, SWT.NONE);
browseButton.setText(VpeUIMessages.BROWSE_BUTTON_TEXT);
- browseButton.setLayoutData(new GridData(SWT.NONE, SWT.NONE, false, false, 1, 1));
+ browseButton.setLayoutData(new GridData(SWT.FILL, SWT.TOP, false, false, 1, 1));
browseButton.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
FileDialog dialog = new FileDialog(PlatformUI.getWorkbench()
@@ -227,29 +191,19 @@
}
/*
* Fill in columns.
- * Tags table has 5 columns with checkbox in the first column.
*/
String[] itemColumnsData = new String[tagsTable.getColumnCount()];
- itemColumnsData[0] = ""; //$NON-NLS-1$
- for (int j = 1; j < itemColumnsData.length; j++) {
+ for (int j = 0; j < itemColumnsData.length; j++) {
/*
* Getting values from tagList
*/
- itemColumnsData[j] = toVisualValue(getValueAt(i, (j-1)));
+ itemColumnsData[j] = toVisualValue(getValueAt(i, j));
}
/*
* Set cells text
*/
tableItem.setText(itemColumnsData);
- /*
- * Adding checkbox to the first column
- */
-// TableEditor editor = new TableEditor(tagsTable);
-// Button check = new Button(tagsTable, SWT.CHECK);
-// check.setBackground(tagsTable.getBackground());
-// editor.minimumWidth = check.getSize().x;
-// editor.grabHorizontal = true;
-// editor.setEditor(check, tableItem, 0);
+
}
/*
@@ -301,23 +255,9 @@
}
public void handleEvent(Event event) {
- Widget source = event.widget;
- if (source == selectAllButton) {
- /*
- * Handle select all event
- */
-
- } else if (source == deselectAllButton) {
- /*
- * Handle deselect all event
- */
-
- } else {
- /*
- * Handle chekbox event
- */
-
- }
+ /*
+ * Do nothing
+ */
}
@Override
@@ -326,7 +266,7 @@
* Later page should be complete some tags are selected.
*/
boolean isPageComplete = false;
- if ((pathString != null) && !"".equalsIgnoreCase(pathString)) { //$NON-NLS-1$
+ if ((pathString != null) && !Constants.EMPTY.equalsIgnoreCase(pathString)) {
isPageComplete = true;
}
return isPageComplete;
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/wizards/ImportUnknownTagsTemplatesWizardPage.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/wizards/ImportUnknownTagsTemplatesWizardPage.java 2010-01-15 16:08:11 UTC (rev 19777)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/wizards/ImportUnknownTagsTemplatesWizardPage.java 2010-01-15 16:17:29 UTC (rev 19778)
@@ -11,9 +11,9 @@
package org.jboss.tools.vpe.editor.wizards;
import java.io.File;
+import java.util.Iterator;
import java.util.List;
-import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
import org.eclipse.jface.viewers.ColumnLayoutData;
import org.eclipse.jface.viewers.ColumnWeightData;
@@ -39,8 +39,10 @@
import org.eclipse.swt.widgets.Widget;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.dialogs.WizardResourceImportPage;
+import org.jboss.tools.vpe.VpePlugin;
import org.jboss.tools.vpe.editor.template.VpeAnyData;
import org.jboss.tools.vpe.editor.template.VpeTemplateManager;
+import org.jboss.tools.vpe.editor.util.Constants;
import org.jboss.tools.vpe.messages.VpeUIMessages;
import org.jboss.tools.vpe.resref.core.ReferenceWizardPage;
@@ -54,21 +56,17 @@
WizardResourceImportPage {
private static final String[] COLUMNS_NAMES = new String[] {
- "", //$NON-NLS-1$
VpeUIMessages.TemplatesTableProvider_TagName,
VpeUIMessages.TemplatesTableProvider_TagForDisplay,
VpeUIMessages.TemplatesTableProvider_URI,
VpeUIMessages.TemplatesTableProvider_Children};
private static final int[] COLUMNS_WIDTHS = new int[] {
- 15, 50, 50, 90, 30
+ 50, 50, 90, 40
};
private String pathString;
private Table tagsTable;
-// private TableViewer tableViewer;
private List<VpeAnyData> tagsList;
- private Button selectAllButton;
- private Button deselectAllButton;
/**
@@ -104,7 +102,7 @@
*/
final Text pathText = new Text(composite, SWT.BORDER);
pathText.setEditable(false);
- pathText.setLayoutData(new GridData(SWT.FILL, SWT.NONE, true, false, 1, 1));
+ pathText.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false, 1, 1));
pathText.addModifyListener(new ModifyListener() {
public void modifyText(ModifyEvent e) {
pathString = ((Text)e.getSource()).getText();
@@ -114,7 +112,7 @@
Button browseButton = new Button(composite, SWT.NONE);
browseButton.setText(VpeUIMessages.BROWSE_BUTTON_TEXT);
- browseButton.setLayoutData(new GridData(SWT.NONE, SWT.NONE, false, false, 1, 1));
+ browseButton.setLayoutData(new GridData(SWT.FILL, SWT.TOP, false, false, 1, 1));
browseButton.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
FileDialog dialog = new FileDialog(PlatformUI.getWorkbench()
@@ -133,10 +131,6 @@
*/
updateTagsTable();
/*
- * Store loaded templates to the default auto-templates location.
- */
- VpeTemplateManager.getInstance().setAnyTemplates(tagsList);
- /*
* Check if the page is complete.
*/
setPageComplete(isPageComplete());
@@ -150,7 +144,7 @@
tagsTable = new Table(composite, SWT.BORDER);
TableLayout layout = new TableLayout();
tagsTable.setLayout(layout);
- tagsTable.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, 2));
+ tagsTable.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 2, 2));
tagsTable.setHeaderVisible(true);
tagsTable.setLinesVisible(true);
@@ -166,25 +160,6 @@
}
/*
- * Add buttons
- */
- selectAllButton = new Button(composite, SWT.NONE);
- selectAllButton.setLayoutData(new GridData(SWT.LEFT, SWT.TOP, false, false, 1, 1));
- selectAllButton.setText(VpeUIMessages.SELECT_ALL);
-
- deselectAllButton = new Button(composite, SWT.NONE);
- deselectAllButton.setLayoutData(new GridData(SWT.LEFT, SWT.TOP, false, false, 1, 1));
- deselectAllButton.setText(VpeUIMessages.DESELECT_ALL);
-
- /*
- * Adding event listeners to the buttons
- */
- selectAllButton.addListener(SWT.Modify, this);
- selectAllButton.addListener(SWT.Selection, this);
- deselectAllButton.addListener(SWT.Modify, this);
- deselectAllButton.addListener(SWT.Selection, this);
-
- /*
* Finishing the initialization
*/
setErrorMessage(null); // should not initially have error message
@@ -212,29 +187,18 @@
}
/*
* Fill in columns.
- * Tags table has 5 columns with checkbox in the first column.
*/
String[] itemColumnsData = new String[tagsTable.getColumnCount()];
- itemColumnsData[0] = ""; //$NON-NLS-1$
- for (int j = 1; j < itemColumnsData.length; j++) {
+ for (int j = 0; j < itemColumnsData.length; j++) {
/*
* Getting values from tagList
*/
- itemColumnsData[j] = toVisualValue(getValueAt(i, (j-1)));
+ itemColumnsData[j] = toVisualValue(getValueAt(i, j));
}
/*
* Set cells text
*/
tableItem.setText(itemColumnsData);
- /*
- * Adding checkbox to the first column
- */
-// TableEditor editor = new TableEditor(tagsTable);
-// Button check = new Button(tagsTable, SWT.CHECK);
-// check.setBackground(tagsTable.getBackground());
-// editor.minimumWidth = check.getSize().x;
-// editor.grabHorizontal = true;
-// editor.setEditor(check, tableItem, 0);
}
/*
@@ -285,33 +249,13 @@
return v;
}
- public void handleEvent(Event event) {
- Widget source = event.widget;
- if (source == selectAllButton) {
- /*
- * Handle select all event
- */
-
- } else if (source == deselectAllButton) {
- /*
- * Handle deselect all event
- */
-
- } else {
- /*
- * Handle chekbox event
- */
-
- }
- }
-
@Override
public boolean isPageComplete() {
/*
* Later page should be complete some tags are selected.
*/
boolean isPageComplete = false;
- if ((pathString != null) && !"".equalsIgnoreCase(pathString)) { //$NON-NLS-1$
+ if ((pathString != null) && !Constants.EMPTY.equalsIgnoreCase(pathString)) {
isPageComplete = true;
}
return isPageComplete;
@@ -319,9 +263,28 @@
public boolean finish() {
- List<VpeAnyData> templates = VpeTemplateManager.getInstance().getAnyTemplates();
- IPath path = new Path(pathString);
- VpeTemplateManager.getInstance().setAnyTemplates(templates, path);
+ /*
+ * Currently used templates list
+ */
+ List<VpeAnyData> currentList = VpeTemplateManager.getInstance().getAnyTemplates();
+
+ Iterator<VpeAnyData> iterator = tagsList.iterator();
+ while (iterator.hasNext()) {
+ VpeAnyData loadedTemplate = (VpeAnyData) iterator.next();
+ for (VpeAnyData currentTemplate : currentList) {
+ if (loadedTemplate.equals(currentTemplate)) {
+ iterator.remove();
+ }
+ }
+ }
+ /*
+ * Store loaded templates to the default auto-templates location.
+ */
+ if (currentList.addAll(tagsList)) {
+ VpeTemplateManager.getInstance().setAnyTemplates(currentList);
+ } else {
+ VpePlugin.getDefault().logError(VpeUIMessages.ERROR_ON_IMPORT_TAG_TEMPLATES);
+ }
return true;
}
@@ -342,6 +305,4 @@
return null;
}
-
-
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java 2010-01-15 16:08:11 UTC (rev 19777)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java 2010-01-15 16:17:29 UTC (rev 19778)
@@ -151,5 +151,6 @@
public static String SELECT_ALL;
public static String DESELECT_ALL;
public static String BROWSE_BUTTON_TEXT;
+ public static String ERROR_ON_IMPORT_TAG_TEMPLATES;
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties 2010-01-15 16:08:11 UTC (rev 19777)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties 2010-01-15 16:17:29 UTC (rev 19778)
@@ -137,4 +137,5 @@
EXPORT_UNKNOWN_TAGS_PAGE_TITLE=Export unknown tags templates wizard
EXPORT_UNKNOWN_TAGS_PAGE_DESCRIPTION=Export unknown tags templates to external file
IMPORT_UNKNOWN_TAGS_PAGE_TITLE=Import unknown tags templates wizard
-IMPORT_UNKNOWN_TAGS_PAGE_DESCRIPTION=Import unknown tags templates from external file
\ No newline at end of file
+IMPORT_UNKNOWN_TAGS_PAGE_DESCRIPTION=Import unknown tags templates from external file
+ERROR_ON_IMPORT_TAG_TEMPLATES=Error while importing unknown tag templates.
\ No newline at end of file
15 years, 11 months
JBoss Tools SVN: r19777 - trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/handlers.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-01-15 11:08:11 -0500 (Fri, 15 Jan 2010)
New Revision: 19777
Modified:
trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/handlers/ESBDefaultVersionResolver.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5484
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/handlers/ESBDefaultVersionResolver.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/handlers/ESBDefaultVersionResolver.java 2010-01-15 15:56:12 UTC (rev 19776)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/handlers/ESBDefaultVersionResolver.java 2010-01-15 16:08:11 UTC (rev 19777)
@@ -25,9 +25,6 @@
*
*/
public class ESBDefaultVersionResolver implements DefaultVersionResolver {
- final static String ROSETTA_JAR = "jbossesb-rosetta.jar"; //$NON-NLS-1$
- final static String LIB_ROSETTA_JAR = "lib-" + ROSETTA_JAR; //$NON-NLS-1$
- final static String VERSION_FILE_NAME = "VERSION";
public String resolve(String[] versionList, XModelObject context) {
IProject project = EclipseResourceUtil.getProject(context);
15 years, 11 months
JBoss Tools SVN: r19776 - in trunk/esb/plugins/org.jboss.tools.esb.core: META-INF and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-01-15 10:56:12 -0500 (Fri, 15 Jan 2010)
New Revision: 19776
Added:
trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/handlers/ESBDefaultVersionResolver.java
Modified:
trunk/esb/plugins/org.jboss.tools.esb.core/META-INF/MANIFEST.MF
trunk/esb/plugins/org.jboss.tools.esb.core/plugin.xml
trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb.meta
trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/handlers/AddProviderSupport.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5484
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/META-INF/MANIFEST.MF 2010-01-15 15:48:35 UTC (rev 19775)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/META-INF/MANIFEST.MF 2010-01-15 15:56:12 UTC (rev 19776)
@@ -12,6 +12,7 @@
org.jboss.tools.esb.core.model.handlers,
org.jboss.tools.esb.core.model.impl
Require-Bundle: org.jboss.tools.jst.web;visibility:=reexport,
- org.eclipse.ui
+ org.eclipse.ui,
+ org.jboss.tools.esb.project.core
Bundle-Version: 2.0.0
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/plugin.xml
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/plugin.xml 2010-01-15 15:48:35 UTC (rev 19775)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/plugin.xml 2010-01-15 15:56:12 UTC (rev 19776)
@@ -51,6 +51,9 @@
class="org.jboss.tools.esb.core.model.handlers.OpenESBResourceHandler"/>
<xclass id="org.jboss.tools.esb.core.model.handlers.AddJBRListerer12Handler"
class="org.jboss.tools.esb.core.model.handlers.AddJBRListerer12Handler"/>
+
+ <xclass id="org.jboss.tools.esb.core.model.handlers.ESBDefaultVersionResolver"
+ class="org.jboss.tools.esb.core.model.handlers.ESBDefaultVersionResolver"/>
<xclass id="org.jboss.tools.esb.core.model.ESBResourceTree"
class="org.jboss.tools.esb.core.model.ESBResourceTree"/>
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb.meta
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb.meta 2010-01-15 15:48:35 UTC (rev 19775)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb.meta 2010-01-15 15:56:12 UTC (rev 19776)
@@ -680,7 +680,8 @@
</XActionItem>
<XDependencies/>
</XModelEntity>
- <XModelEntity ImplementingClass="org.jboss.tools.esb.core.model.impl.FTPMessageFilterImpl"
+ <XModelEntity
+ ImplementingClass="org.jboss.tools.esb.core.model.impl.FTPMessageFilterImpl"
PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;saveDefault=false"
XMLSUBPATH="ftp-message-filter" name="ESBFTPMessageFilter101">
<XChildrenEntities/>
@@ -2932,7 +2933,7 @@
<XActionItem displayName="JBoss ESB" kind="list" name="ESB">
<XActionItem HIDE="always" HandlerClassName="%SpecialWizard%"
ICON="action.new.seam.faces-config"
- PROPERTIES="entity=FileESB101;extensions=.xml.;validator.addfile=true;support=org.jboss.tools.common.model.files.handlers.CreateFileSupport;extension=xml;entityVersion=ESB"
+ PROPERTIES="entity=FileESB101;extensions=.xml.;validator.addfile=true;support=org.jboss.tools.common.model.files.handlers.CreateFileSupport;extension=xml;entityVersion=ESB;defaultVersionResolver=org.jboss.tools.esb.core.model.handlers.ESBDefaultVersionResolver"
displayName="JBoss ESB File..." kind="action" name="CreateFileESB">
<EntityData EntityName="NewFileWizard">
<AttributeData AttributeName="folder"/>
@@ -2963,7 +2964,7 @@
<XActionItem displayName="JBoss ESB" kind="list" name="ESB">
<XActionItem HIDE="always" HandlerClassName="%SpecialWizard%"
ICON="action.new.seam.faces-config"
- PROPERTIES="entity=FileESB101;extensions=.xml.;validator.addfile=true;support=org.jboss.tools.common.model.files.handlers.CreateFileSupport;extension=xml;entityVersion=ESB"
+ PROPERTIES="entity=FileESB101;extensions=.xml.;validator.addfile=true;support=org.jboss.tools.common.model.files.handlers.CreateFileSupport;extension=xml;entityVersion=ESB;defaultVersionResolver=org.jboss.tools.esb.core.model.handlers.ESBDefaultVersionResolver"
displayName="JBoss ESB File..." kind="action" name="CreateFileESB">
<EntityData EntityName="NewFileWizard">
<AttributeData AttributeName="folder"/>
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/handlers/AddProviderSupport.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/handlers/AddProviderSupport.java 2010-01-15 15:48:35 UTC (rev 19775)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/handlers/AddProviderSupport.java 2010-01-15 15:56:12 UTC (rev 19776)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * 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.esb.core.model.handlers;
import java.util.Properties;
@@ -8,6 +18,11 @@
import org.jboss.tools.common.model.util.FindObjectHelper;
import org.jboss.tools.common.model.util.XModelObjectLoaderUtil;
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
public class AddProviderSupport extends SpecialWizardSupport {
String providerEntity;
String busEntity;
Added: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/handlers/ESBDefaultVersionResolver.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/handlers/ESBDefaultVersionResolver.java (rev 0)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/handlers/ESBDefaultVersionResolver.java 2010-01-15 15:56:12 UTC (rev 19776)
@@ -0,0 +1,81 @@
+/*******************************************************************************
+ * 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.esb.core.model.handlers;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.jboss.tools.common.model.XModelObject;
+import org.jboss.tools.common.model.files.handlers.CreateFileSupport.DefaultVersionResolver;
+import org.jboss.tools.common.model.util.EclipseResourceUtil;
+import org.jboss.tools.esb.core.facet.IJBossESBFacetDataModelProperties;
+import org.jboss.tools.esb.core.runtime.JBossESBRuntime;
+import org.jboss.tools.esb.core.runtime.JBossRuntimeManager;
+
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
+public class ESBDefaultVersionResolver implements DefaultVersionResolver {
+ final static String ROSETTA_JAR = "jbossesb-rosetta.jar"; //$NON-NLS-1$
+ final static String LIB_ROSETTA_JAR = "lib-" + ROSETTA_JAR; //$NON-NLS-1$
+ final static String VERSION_FILE_NAME = "VERSION";
+
+ public String resolve(String[] versionList, XModelObject context) {
+ IProject project = EclipseResourceUtil.getProject(context);
+ if(project == null) return null;
+ String qRuntimeName = null;
+
+ try {
+ qRuntimeName = project.getPersistentProperty(IJBossESBFacetDataModelProperties.PERSISTENCE_PROPERTY_QNAME_RUNTIME_NAME);
+ } catch (CoreException e) {
+ //ignore
+ }
+ if(qRuntimeName == null) return null;
+
+ JBossESBRuntime runtime = JBossRuntimeManager.getInstance().findRuntimeByName(qRuntimeName);
+ if(runtime == null) return null;
+
+ String v = runtime.getVersion();
+ if(v == null) return null;
+ String[] ts = v.split("\\.");
+ int major = 0;
+ int minor = 0;
+ if(ts.length >= 1) {
+ try {
+ major = Integer.parseInt(ts[0]);
+ } catch (NumberFormatException e) {
+ //ignore
+ }
+ }
+ if(ts.length >= 2) {
+ try {
+ minor = Integer.parseInt(ts[0]);
+ } catch (NumberFormatException e) {
+ //ignore
+ }
+ }
+
+ if(major < 4) {
+ return "1.0.1";
+ }
+ if(major > 4) {
+ return null;
+ }
+ if(minor >= 7) {
+ return "1.2.0";
+ } else {
+ return "1.1.0";
+ }
+
+ }
+
+}
Property changes on: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/handlers/ESBDefaultVersionResolver.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
15 years, 11 months
JBoss Tools SVN: r19775 - trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/files/handlers.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-01-15 10:48:35 -0500 (Fri, 15 Jan 2010)
New Revision: 19775
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/files/handlers/CreateFileSupport.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5484
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/files/handlers/CreateFileSupport.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/files/handlers/CreateFileSupport.java 2010-01-15 15:43:16 UTC (rev 19774)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/files/handlers/CreateFileSupport.java 2010-01-15 15:48:35 UTC (rev 19775)
@@ -40,6 +40,10 @@
protected TargetHolder targetHolder = new TargetHolder();
TreeMap<String,String> versionEntities = new TreeMap<String,String>();
boolean useVersions = false;
+
+ public static interface DefaultVersionResolver {
+ public String resolve(String[] versionList, XModelObject context);
+ }
public void reset() {
targetHolder.setAction(action);
@@ -108,7 +112,16 @@
String[] versionList = (String[])versionEntities.keySet().toArray(new String[0]);
setValueList(0, "version", versionList); //$NON-NLS-1$
if(versionList.length > 0) {
- setAttributeValue(0, "version", versionList[0]); //$NON-NLS-1$
+ String defaultVersion = versionList[versionList.length - 1];
+ String defaultVersionResolver = action.getProperty("defaultVersionResolver"); //$NON-NLS-1$
+ if(defaultVersionResolver != null) {
+ DefaultVersionResolver resolver = (DefaultVersionResolver)ModelFeatureFactory.getInstance().createFeatureInstance(defaultVersionResolver);
+ if(resolver != null) {
+ String d = resolver.resolve(versionList, getTarget());
+ if(d != null) defaultVersion = d;
+ }
+ }
+ setAttributeValue(0, "version", defaultVersion); //$NON-NLS-1$
}
}
15 years, 11 months
JBoss Tools SVN: r19774 - trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-01-15 10:43:16 -0500 (Fri, 15 Jan 2010)
New Revision: 19774
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/StaticLibraries.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5650
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/StaticLibraries.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/StaticLibraries.java 2010-01-15 15:30:22 UTC (rev 19773)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/StaticLibraries.java 2010-01-15 15:43:16 UTC (rev 19774)
@@ -10,12 +10,13 @@
******************************************************************************/
package org.jboss.tools.jst.web.kb.internal;
+
import java.io.File;
import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import org.eclipse.core.runtime.Path;
-import org.jboss.tools.common.model.XModel;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.jst.web.kb.internal.scanner.LoadedDeclarations;
@@ -32,29 +33,38 @@
static StaticLibraries instance = new StaticLibraries();
LibraryStorage libraries = new LibraryStorage();
- HashMap<File, XModel> loaded = new HashMap<File, XModel>();
+ Map<File, XModelObject> loadedFolders = new HashMap<File, XModelObject>();
+ Map<File, XModelObject> loadedFiles = new HashMap<File, XModelObject>();
private StaticLibraries() {}
public ITagLibrary[] getLibraries(String uri) {
File file = TagLibraryManager.getStaticTLD(uri);
if(file == null) return new ITagLibrary[0];
+ if(loadedFiles.containsKey(file)) {
+ return libraries.getLibrariesArray(uri);
+ }
File folder = file.getParentFile();
- if(!loaded.containsKey(folder)) {
+ if(!loadedFolders.containsKey(folder)) {
XModelObject o = EclipseResourceUtil.createObjectForLocation(file.getAbsolutePath());
if(o != null) {
- loaded.put(folder, o.getModel());
- XModelObject[] fs = o.getParent().getChildren();
+ loadedFolders.put(folder, o.getParent());
+ }
+ }
+ XModelObject o = loadedFolders.get(folder);
+ if(o != null) {
+ XModelObject fo = o.getChildByPath(file.getName());
+ if (fo != null) {
+ loadedFiles.put(file, fo);
XMLScanner scanner = new XMLScanner();
- for (XModelObject fo: fs) {
- LoadedDeclarations ds = scanner.parse(fo, new Path(folder.getAbsolutePath()), null);
- List<ITagLibrary> ls = ds.getLibraries();
- for (ITagLibrary l: ls) {
- libraries.addLibrary(l);
- }
+ LoadedDeclarations ds = scanner.parse(fo, new Path(file.getAbsolutePath()), null);
+ List<ITagLibrary> ls = ds.getLibraries();
+ for (ITagLibrary l : ls) {
+ libraries.addLibrary(l);
}
- }
+ }
}
+
return libraries.getLibrariesArray(uri);
}
15 years, 11 months
JBoss Tools SVN: r19773 - trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/taglib.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-01-15 10:30:22 -0500 (Fri, 15 Jan 2010)
New Revision: 19773
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/taglib/TagLibraryManager.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5650
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/taglib/TagLibraryManager.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/taglib/TagLibraryManager.java 2010-01-15 14:03:57 UTC (rev 19772)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/taglib/TagLibraryManager.java 2010-01-15 15:30:22 UTC (rev 19773)
@@ -59,6 +59,12 @@
try {
if (uri != null) {
String id = XMLCorePlugin.getDefault().getDefaultXMLCatalog().resolveURI(uri);
+ if(id==null) {
+ id = XMLCorePlugin.getDefault().getDefaultXMLCatalog().resolveSystem(uri);
+ }
+ if(id==null) {
+ id = XMLCorePlugin.getDefault().getDefaultXMLCatalog().resolvePublic(uri, uri);
+ }
if(id!=null) {
File file = new File(new URL(id).getFile());
if(file.exists()) {
15 years, 11 months
JBoss Tools SVN: r19772 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-01-15 09:03:57 -0500 (Fri, 15 Jan 2010)
New Revision: 19772
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5685
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 2010-01-15 13:48:23 UTC (rev 19771)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java 2010-01-15 14:03:57 UTC (rev 19772)
@@ -589,7 +589,7 @@
if(dec instanceof ISeamJavaComponentDeclaration) {
ISeamJavaComponentDeclaration javaDec = (ISeamJavaComponentDeclaration)dec;
// Check names
- if(javaDec.getName()!=null && javaDec.getName().equals(declaration.getName())) {
+ if(declaration.getClassName()!=null && javaDec.getName()!=null && javaDec.getName().equals(declaration.getName())) {
// Check precedences
String javaPrecedence = "" + javaDec.getPrecedence();
if(javaPrecedence.equals(precedence)) {
15 years, 11 months
JBoss Tools SVN: r19771 - trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-01-15 08:48:23 -0500 (Fri, 15 Jan 2010)
New Revision: 19771
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/facelet-taglib2.meta
Log:
https://jira.jboss.org/jira/browse/JBIDE-5670
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/facelet-taglib2.meta
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/facelet-taglib2.meta 2010-01-15 13:37:30 UTC (rev 19770)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/facelet-taglib2.meta 2010-01-15 13:48:23 UTC (rev 19771)
@@ -150,6 +150,7 @@
<XActionItemReference entity="FaceletTaglibExtension" name="CreateActions"/>
<XActionItemReference entity="FaceletTaglibExtension" name="DeleteActions"/>
<XActionItemReference entity="FaceletTaglibExtension" name="CopyActions"/>
+ <XActionItemReference entity="FaceletTaglibFunction" name="MoveActions"/>
</XActionItem>
<XDependencies/>
</XModelEntity>
@@ -234,6 +235,7 @@
<XActionItemReference entity="FaceletTaglibExtension" name="CreateActions"/>
<XActionItemReference entity="FaceletTaglibExtension" name="DeleteActions"/>
<XActionItemReference entity="FaceletTaglibExtension" name="CopyActions"/>
+ <XActionItemReference entity="FaceletTaglibFunction" name="MoveActions"/>
</XActionItem>
<XDependencies/>
</XModelEntity>
@@ -316,6 +318,7 @@
<XActionItemReference entity="FaceletTaglibExtension" name="CreateActions"/>
<XActionItemReference entity="FaceletTaglibExtension" name="DeleteActions"/>
<XActionItemReference entity="FaceletTaglibExtension" name="CopyActions"/>
+ <XActionItemReference entity="FaceletTaglibFunction" name="MoveActions"/>
</XActionItem>
<XDependencies/>
</XModelEntity>
@@ -352,9 +355,14 @@
ICON="action.delete" displayName="Delete" kind="action" name="Delete"/>
</XActionItem>
<XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
+ <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%"
+ ICON="action.cut" displayName="Cut" kind="action" name="Cut"/>
+ <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
+ ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
<XActionItem BaseActionName="Paste" HandlerClassName="%Paste%"
ICON="action.paste" displayName="Paste" kind="action" name="Paste"/>
</XActionItem>
+ <XActionItemReference entity="FaceletTaglibFunction" name="MoveActions"/>
</XActionItem>
<XDependencies/>
</XModelEntity>
@@ -611,6 +619,7 @@
<XActionItemReference entity="FaceletTaglibExtension" name="CreateActions"/>
<XActionItemReference entity="FaceletTaglibExtension" name="DeleteActions"/>
<XActionItemReference entity="FaceletTaglibExtension" name="CopyActions"/>
+ <XActionItemReference entity="FaceletTaglibFunction" name="MoveActions"/>
</XActionItem>
<XDependencies/>
</XModelEntity>
@@ -702,6 +711,7 @@
<XActionItemReference entity="FaceletTaglibExtension" name="CreateActions"/>
<XActionItemReference entity="FaceletTaglibExtension" name="DeleteActions"/>
<XActionItemReference entity="FaceletTaglibExtension" name="CopyActions"/>
+ <XActionItemReference entity="FaceletTaglibFunction" name="MoveActions"/>
</XActionItem>
<XDependencies/>
</XModelEntity>
15 years, 11 months
JBoss Tools SVN: r19770 - trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-01-15 08:37:30 -0500 (Fri, 15 Jan 2010)
New Revision: 19770
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/facelet-taglib2.meta
Log:
https://jira.jboss.org/jira/browse/JBIDE-5642
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/facelet-taglib2.meta
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/facelet-taglib2.meta 2010-01-15 13:25:06 UTC (rev 19769)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/facelet-taglib2.meta 2010-01-15 13:37:30 UTC (rev 19770)
@@ -72,7 +72,7 @@
<XDependencies/>
</XModelEntity>
<XModelEntity ImplementingClass="%FT_TagDecl%"
- PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.jsf.ui.editor.form.FaceletTaglibXMLFormLayoutData"
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.jsf.ui.editor.form.FaceletTaglibXMLFormLayoutData;children=%Ordered%"
XMLSUBPATH="behavior" name="FaceletTaglibBehavior20">
<XChildrenEntities>
<XChildEntity name="FaceletTaglibBehaviorExtension"/>
@@ -154,7 +154,7 @@
<XDependencies/>
</XModelEntity>
<XModelEntity ImplementingClass="%FT_TagDecl%"
- PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.jsf.ui.editor.form.FaceletTaglibXMLFormLayoutData"
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.jsf.ui.editor.form.FaceletTaglibXMLFormLayoutData;children=%Ordered%"
XMLSUBPATH="component" name="FaceletTaglibComponent20">
<XChildrenEntities>
<XChildEntity name="FaceletTaglibComponentExtension"/>
@@ -238,7 +238,7 @@
<XDependencies/>
</XModelEntity>
<XModelEntity ImplementingClass="%FT_TagDecl%"
- PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.jsf.ui.editor.form.FaceletTaglibXMLFormLayoutData"
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.jsf.ui.editor.form.FaceletTaglibXMLFormLayoutData;children=%Ordered%"
XMLSUBPATH="converter" name="FaceletTaglibConverter20">
<XChildrenEntities>
<XChildEntity name="FaceletTaglibConverterExtension"/>
@@ -483,7 +483,7 @@
<XDependencies/>
</XModelEntity>
<XModelEntity ImplementingClass="%Custom%"
- PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.jsf.ui.editor.form.FaceletTaglibXMLFormLayoutData"
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.jsf.ui.editor.form.FaceletTaglibXMLFormLayoutData;children=%EntityOrdered%"
XMLSUBPATH="tag" name="FaceletTaglibTag20">
<XChildrenEntities>
<XChildEntity maxCount="1" name="FaceletTaglibHandler20"/>
@@ -615,7 +615,7 @@
<XDependencies/>
</XModelEntity>
<XModelEntity ImplementingClass="%FT_TagDecl%"
- PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.jsf.ui.editor.form.FaceletTaglibXMLFormLayoutData"
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.jsf.ui.editor.form.FaceletTaglibXMLFormLayoutData;children=%Ordered%"
XMLSUBPATH="validator" name="FaceletTaglibValidator20">
<XChildrenEntities>
<XChildEntity name="FaceletTaglibValidatorExtension"/>
@@ -710,7 +710,7 @@
ImplementationLoadingClass="org.jboss.tools.jsf.facelet.model.FaceletTaglibLoader"
ImplementingClass="org.jboss.tools.common.model.filesystems.impl.SimpleFileImpl"
ObjectEditorClass="%XML%"
- PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.jsf.ui.editor.form.FaceletTaglibXMLFormLayoutData"
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.jsf.ui.editor.form.FaceletTaglibXMLFormLayoutData;children=%Ordered%"
XMLSUBPATH="facelet-taglib" name="FileFaceletTaglib20">
<XChildrenEntities>
<XChildEntity name="FaceletTaglibTag20"/>
15 years, 11 months
JBoss Tools SVN: r19769 - trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/form.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-01-15 08:25:06 -0500 (Fri, 15 Jan 2010)
New Revision: 19769
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/form/FaceletTaglibXMLFormLayoutData.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5642
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/form/FaceletTaglibXMLFormLayoutData.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/form/FaceletTaglibXMLFormLayoutData.java 2010-01-15 13:16:57 UTC (rev 19768)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/form/FaceletTaglibXMLFormLayoutData.java 2010-01-15 13:25:06 UTC (rev 19769)
@@ -28,11 +28,17 @@
public static String EMPTY_DESCRIPTION = ""; //$NON-NLS-1$
- private final static IFormData[] FORM_LAYOUT_DEFINITIONS = new IFormData[] {
-
-
+ private final static IFormData[] FORM_LAYOUT_DEFINITIONS = new IFormData[] {
};
+ public static IFormData ATTRIBUTE_LIST = new FormData(
+ "Attributes",
+ "", //"Description //$NON-NLS-1$
+ new FormAttributeData[]{new FormAttributeData("name", 100)}, //$NON-NLS-1$
+ new String[]{"FaceletTaglibAttribute20"}, //$NON-NLS-1$
+ FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddAttribute") //$NON-NLS-1$
+ );
+
private static Map<String,IFormData> FORM_LAYOUT_DEFINITION_MAP = Collections.synchronizedMap(new ArrayToMap(FORM_LAYOUT_DEFINITIONS));
private static FaceletTaglibXMLFormLayoutData INSTANCE = new FaceletTaglibXMLFormLayoutData();
@@ -79,6 +85,9 @@
if(entity.getChild("AnyElement") != null) {
list.add(ModelFormLayoutData.TAG_LIST);
}
+ if(entityName.equals("FaceletTaglibTag20")) {
+ list.add(ATTRIBUTE_LIST);
+ }
IFormData a = ModelFormLayoutData.createAdvancedFormData(entityName);
if(a != null) list.add(a);
IFormData[] ds = list.toArray(new IFormData[0]);
15 years, 11 months