JBoss Tools SVN: r16389 - trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form.
by jbosstools-commits＠lists.jboss.org
Author: sflanigan
Date: 2009-07-05 20:42:41 -0400 (Sun, 05 Jul 2009)
New Revision: 16389
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/HibConfig3CacheFormLayoutData.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/HibConfig3EventFormLayoutData.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/HibConfig3FileFormLayoutData.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/HibConfig3MappingFormLayoutData.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/HibConfig3PropertyFormLayoutData.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/HibConfig3SessionFormLayoutData.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3AnyFormLayoutData.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3ColumnFormLayoutData.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3FormLayoutDataUtil.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3FormulaFormLayoutData.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3IdFormLayoutData.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3KeyFormLayoutData.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3ListFormLayoutData.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3ManyToOneFormLayoutData.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3MapFormLayoutData.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3MetaFormLayoutData.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3OneToOneFormLayoutData.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3PropertyFormLayoutData.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3SQLQueryFormLayoutData.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3SetFormLayoutData.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3557 Externalize English strings
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/HibConfig3CacheFormLayoutData.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/HibConfig3CacheFormLayoutData.java 2009-07-06 00:33:40 UTC (rev 16388)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/HibConfig3CacheFormLayoutData.java 2009-07-06 00:42:41 UTC (rev 16389)
@@ -22,19 +22,19 @@
static String COLLECTION_CACHE_ENTITY = "HibConfig3CollectionCache"; //$NON-NLS-1$
final static IFormData CACHE_LIST_DEFINITION = new FormData(
- "Caches",
+ Messages.HibConfig3CacheFormLayoutData_List,
"", //Description //$NON-NLS-1$
"Caches", //$NON-NLS-1$
- new FormAttributeData[]{new FormAttributeData("item", 100, "item")}, //$NON-NLS-1$
+ new FormAttributeData[]{new FormAttributeData("item", 100, Messages.HibConfig3CacheFormLayoutData_Item)}, //$NON-NLS-1$
new String[]{CLASS_CACHE_ENTITY, COLLECTION_CACHE_ENTITY},
Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddCache") //$NON-NLS-1$
);
final static IFormData CACHE_FOLDER_DEFINITION = new FormData(
- "Caches",
+ Messages.HibConfig3CacheFormLayoutData_Folder,
"", //"Description //$NON-NLS-1$
"HibConfig3CachesFolder", //$NON-NLS-1$
- new FormAttributeData[]{new FormAttributeData("item", 100, "item")}, //$NON-NLS-1$
+ new FormAttributeData[]{new FormAttributeData("item", 100, Messages.HibConfig3CacheFormLayoutData_Item)}, //$NON-NLS-1$
new String[]{CLASS_CACHE_ENTITY, COLLECTION_CACHE_ENTITY},
Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddCache") //$NON-NLS-1$
);
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/HibConfig3EventFormLayoutData.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/HibConfig3EventFormLayoutData.java 2009-07-06 00:33:40 UTC (rev 16388)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/HibConfig3EventFormLayoutData.java 2009-07-06 00:42:41 UTC (rev 16389)
@@ -23,48 +23,48 @@
static String LISTENER_ENTITY = "HibConfig3Listener"; //$NON-NLS-1$
final static IFormData EVENT_LIST_DEFINITION = new FormData(
- "Events",
+ Messages.HibConfig3EventFormLayoutData_List,
"", //Description //$NON-NLS-1$
"Events", //$NON-NLS-1$
- new FormAttributeData[]{new FormAttributeData("type", 100, "type")}, //$NON-NLS-1$
+ new FormAttributeData[]{new FormAttributeData("type", 100, Messages.HibConfig3EventFormLayoutData_Type)}, //$NON-NLS-1$
new String[]{EVENT_ENTITY},
Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddEvent") //$NON-NLS-1$
);
final static IFormData EVENT_FOLDER_DEFINITION = new FormData(
- "Events",
+ Messages.HibConfig3EventFormLayoutData_Folder,
"", //Description //$NON-NLS-1$
"HibConfig3EventsFolder", //$NON-NLS-1$
- new FormAttributeData[]{new FormAttributeData("type", 100, "type")}, //$NON-NLS-1$
+ new FormAttributeData[]{new FormAttributeData("type", 100, Messages.HibConfig3EventFormLayoutData_Type)}, //$NON-NLS-1$
new String[]{EVENT_ENTITY},
Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddEvent") //$NON-NLS-1$
);
final static IFormData LISTENER_LIST_DEFINITION = new FormData(
- "Listeners",
+ Messages.HibConfig3EventFormLayoutData_ListenerList,
"", //Description //$NON-NLS-1$
// "Listeners",
new FormAttributeData[]{
- new FormAttributeData("class", 70, "class"), //$NON-NLS-1$
- new FormAttributeData("type", 30, "type")}, //$NON-NLS-1$
+ new FormAttributeData("class", 70, Messages.HibConfig3EventFormLayoutData_Class), //$NON-NLS-1$
+ new FormAttributeData("type", 30, Messages.HibConfig3EventFormLayoutData_Type)}, //$NON-NLS-1$
new String[]{LISTENER_ENTITY},
Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddListener") //$NON-NLS-1$
);
final static IFormData LISTENER_FOLDER_DEFINITION = new FormData(
- "Listeners",
+ Messages.HibConfig3EventFormLayoutData_ListenerFolder,
"", //"Description //$NON-NLS-1$
"HibConfig3ListenersFolder", //$NON-NLS-1$
new FormAttributeData[]{
- new FormAttributeData("class", 70, "class"), //$NON-NLS-1$
- new FormAttributeData("type", 30, "type")}, //$NON-NLS-1$
+ new FormAttributeData("class", 70, Messages.HibConfig3EventFormLayoutData_Class), //$NON-NLS-1$
+ new FormAttributeData("type", 30, Messages.HibConfig3EventFormLayoutData_Type)}, //$NON-NLS-1$
new String[]{LISTENER_ENTITY},
Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddListener") //$NON-NLS-1$
);
final static IFormData[] EVENT_DEFINITIONS = new IFormData[] {
new FormData(
- "Event",
+ Messages.HibConfig3EventFormLayoutData_EventHeader,
"", //"Description //$NON-NLS-1$
Hibernate3FormLayoutDataUtil.createGeneralFormAttributeData(EVENT_ENTITY)
),
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/HibConfig3FileFormLayoutData.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/HibConfig3FileFormLayoutData.java 2009-07-06 00:33:40 UTC (rev 16388)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/HibConfig3FileFormLayoutData.java 2009-07-06 00:42:41 UTC (rev 16389)
@@ -21,7 +21,7 @@
private final static IFormData[] FILE_DEFINITIONS =
new IFormData[] {
new FormData(
- "File Hibernate Configuration 3.0",
+ Messages.HibConfig3FileFormLayoutData_Header,
"", //"Description //$NON-NLS-1$
Hibernate3FormLayoutDataUtil.createGeneralFormAttributeData("FileHibConfig3") //$NON-NLS-1$
),
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/HibConfig3MappingFormLayoutData.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/HibConfig3MappingFormLayoutData.java 2009-07-06 00:33:40 UTC (rev 16388)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/HibConfig3MappingFormLayoutData.java 2009-07-06 00:42:41 UTC (rev 16389)
@@ -21,19 +21,19 @@
static String MAPPING_ENTITY = "HibConfig3Mapping"; //$NON-NLS-1$
final static IFormData MAPPING_LIST_DEFINITION = new FormData(
- "Mappings",
+ Messages.HibConfig3MappingFormLayoutData_List,
"", //Description //$NON-NLS-1$
"Mappings", //$NON-NLS-1$
- new FormAttributeData[]{new FormAttributeData("item", 100, "item")}, //$NON-NLS-1$
+ new FormAttributeData[]{new FormAttributeData("item", 100, Messages.HibConfig3MappingFormLayoutData_Item)}, //$NON-NLS-1$
new String[]{MAPPING_ENTITY},
Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddMapping") //$NON-NLS-1$
);
final static IFormData MAPPING_FOLDER_DEFINITION = new FormData(
- "Mappings",
+ Messages.HibConfig3MappingFormLayoutData_Folder,
"", //"Description //$NON-NLS-1$
"HibConfig3MappingsFolder", //$NON-NLS-1$
- new FormAttributeData[]{new FormAttributeData("item", 100, "item")}, //$NON-NLS-1$
+ new FormAttributeData[]{new FormAttributeData("item", 100, Messages.HibConfig3MappingFormLayoutData_Item)}, //$NON-NLS-1$
new String[]{MAPPING_ENTITY},
Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddMapping") //$NON-NLS-1$
);
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/HibConfig3PropertyFormLayoutData.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/HibConfig3PropertyFormLayoutData.java 2009-07-06 00:33:40 UTC (rev 16388)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/HibConfig3PropertyFormLayoutData.java 2009-07-06 00:42:41 UTC (rev 16389)
@@ -21,19 +21,19 @@
static String PROPERTY_ENTITY = "HibConfig3Property"; //$NON-NLS-1$
final static IFormData PROPERTY_LIST_DEFINITION = new FormData(
- "Properties",
+ Messages.HibConfig3PropertyFormLayoutData_List,
"", //Description //$NON-NLS-1$
"Properties", //$NON-NLS-1$
- new FormAttributeData[]{new FormAttributeData("name", 100, "name")}, //$NON-NLS-1$
+ new FormAttributeData[]{new FormAttributeData("name", 100, Messages.HibConfig3PropertyFormLayoutData_Name)}, //$NON-NLS-1$
new String[]{PROPERTY_ENTITY},
Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddProperty") //$NON-NLS-1$
);
final static IFormData PROPERTY_FOLDER_DEFINITION = new FormData(
- "Properties",
+ Messages.HibConfig3PropertyFormLayoutData_Folder,
"", //"Description //$NON-NLS-1$
"HibConfig3PropertiesFolder", //$NON-NLS-1$
- new FormAttributeData[]{new FormAttributeData("name", 100, "name")}, //$NON-NLS-1$
+ new FormAttributeData[]{new FormAttributeData("name", 100, Messages.HibConfig3PropertyFormLayoutData_Name)}, //$NON-NLS-1$
new String[]{PROPERTY_ENTITY},
Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddProperty") //$NON-NLS-1$
);
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/HibConfig3SessionFormLayoutData.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/HibConfig3SessionFormLayoutData.java 2009-07-06 00:33:40 UTC (rev 16388)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/HibConfig3SessionFormLayoutData.java 2009-07-06 00:42:41 UTC (rev 16389)
@@ -21,7 +21,7 @@
private final static IFormData[] SESSION_FACTORY_DEFINITIONS =
new IFormData[] {
new FormData(
- "Session Factory",
+ Messages.HibConfig3SessionFormLayoutData_Header,
"", //"Description //$NON-NLS-1$
Hibernate3FormLayoutDataUtil.createGeneralFormAttributeData("HibConfig3SessionFactory") //$NON-NLS-1$
),
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3AnyFormLayoutData.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3AnyFormLayoutData.java 2009-07-06 00:33:40 UTC (rev 16388)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3AnyFormLayoutData.java 2009-07-06 00:42:41 UTC (rev 16389)
@@ -22,7 +22,7 @@
static String META_VALUE_ENTITY = "Hibernate3MetaValue"; //$NON-NLS-1$
static IFormData META_VALUE_LIST_DEFINITION = new FormData(
- "Meta Values",
+ Messages.Hibernate3AnyFormLayoutData_List,
"", //"Description //$NON-NLS-1$
new FormAttributeData[]{new FormAttributeData("value", 50), new FormAttributeData("class", 50)}, //$NON-NLS-1$ //$NON-NLS-2$
new String[]{META_VALUE_ENTITY},
@@ -31,7 +31,7 @@
final static IFormData[] ANY_DEFINITIONS = new IFormData[] {
new FormData(
- "Any",
+ Messages.Hibernate3AnyFormLayoutData_General,
"", //"Description //$NON-NLS-1$
Hibernate3FormLayoutDataUtil.createGeneralFormAttributeData(ANY_ENTITY)
),
@@ -39,7 +39,7 @@
Hibernate3ColumnFormLayoutData.COLUMN_LIST_DEFINITION,
Hibernate3MetaFormLayoutData.META_LIST_DEFINITION,
new FormData(
- "Advanced",
+ Messages.Hibernate3AnyFormLayoutData_Advanced,
"", //"Description //$NON-NLS-1$
Hibernate3FormLayoutDataUtil.createAdvancedFormAttributeData(ANY_ENTITY)
),
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3ColumnFormLayoutData.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3ColumnFormLayoutData.java 2009-07-06 00:33:40 UTC (rev 16388)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3ColumnFormLayoutData.java 2009-07-06 00:42:41 UTC (rev 16389)
@@ -20,7 +20,7 @@
public class Hibernate3ColumnFormLayoutData {
final static IFormData COLUMN_LIST_DEFINITION = new FormData(
- "Columns",
+ Messages.Hibernate3ColumnFormLayoutData_List,
"", //"Description //$NON-NLS-1$
new FormAttributeData[]{new FormAttributeData("name", 50), new FormAttributeData("sql-type", 50)}, //$NON-NLS-1$ //$NON-NLS-2$
new String[]{"Hibernate3Column"}, //$NON-NLS-1$
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3FormLayoutDataUtil.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3FormLayoutDataUtil.java 2009-07-06 00:33:40 UTC (rev 16388)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3FormLayoutDataUtil.java 2009-07-06 00:42:41 UTC (rev 16389)
@@ -38,10 +38,12 @@
// private final static String DEFAULT_EDIT_ACTION = "Properties.Properties";
/**
- * (non-translatable)
+ *
+ * @param entityName (non-translatable)
+ * @return
*/
public static IFormAttributeData[] createGeneralFormAttributeData(String entityName) {
- return createFormAttributeData(entityName, "general");
+ return createFormAttributeData(entityName, "general"); //$NON-NLS-1$
}
/**
@@ -50,7 +52,7 @@
* @return
*/
public static IFormAttributeData[] createAdvancedFormAttributeData(String entityName) {
- return createFormAttributeData(entityName, "advanced");
+ return createFormAttributeData(entityName, "advanced"); //$NON-NLS-1$
}
/**
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3FormulaFormLayoutData.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3FormulaFormLayoutData.java 2009-07-06 00:33:40 UTC (rev 16388)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3FormulaFormLayoutData.java 2009-07-06 00:42:41 UTC (rev 16389)
@@ -22,7 +22,7 @@
static String FORMULA_ENTITY = "Hibernate3Formula"; //$NON-NLS-1$
static IFormData FORMULA_LIST_DEFINITION = new FormData(
- "Formulas",
+ Messages.Hibernate3FormulaFormLayoutData_FormulaList,
"", //"Description //$NON-NLS-1$
new FormAttributeData[]{new FormAttributeData("value", 100)}, //$NON-NLS-1$
new String[]{FORMULA_ENTITY},
@@ -30,7 +30,7 @@
);
static IFormData FORMULA_DEFINITION = new FormData(
- "Formula",
+ Messages.Hibernate3FormulaFormLayoutData_Formula,
"", //"Description //$NON-NLS-1$
FORMULA_ENTITY,
new FormAttributeData[]{new FormAttributeData("value", GreedyLayoutDataFactory.getInstance())} //$NON-NLS-1$
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3IdFormLayoutData.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3IdFormLayoutData.java 2009-07-06 00:33:40 UTC (rev 16388)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3IdFormLayoutData.java 2009-07-06 00:42:41 UTC (rev 16389)
@@ -23,17 +23,17 @@
final static IFormData[] COMPOSITE_ID_DEFINITIONS = new IFormData[] {
new FormData(
- "Composite ID",
+ Messages.Hibernate3IdFormLayoutData_CompositeID,
"", //"Description //$NON-NLS-1$
Hibernate3FormLayoutDataUtil.createGeneralFormAttributeData(COMPOSITE_ID_ENTITY)
),
Hibernate3FormLayoutDataUtil.createChildrenFormData(
- "Key Properties", null, null,
+ Messages.Hibernate3IdFormLayoutData_IDKeyProperties, null, null,
"name", //$NON-NLS-1$
new String[]{"Hibernate3KeyProperty", "Hibernate3KeyManyToOne"}, "CreateActions.AddKeys.AddKey"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
Hibernate3MetaFormLayoutData.META_LIST_DEFINITION,
new FormData(
- "Advanced",
+ Messages.Hibernate3IdFormLayoutData_Advanced,
"", //"Description //$NON-NLS-1$
Hibernate3FormLayoutDataUtil.createAdvancedFormAttributeData(COMPOSITE_ID_ENTITY)
),
@@ -45,14 +45,14 @@
final static IFormData[] COLLECTION_ID_DEFINITIONS = new IFormData[] {
new FormData(
- "Collection ID",
+ Messages.Hibernate3IdFormLayoutData_CollectionID,
"", //"Description //$NON-NLS-1$
Hibernate3FormLayoutDataUtil.createGeneralFormAttributeData(COLLECTION_ID_ENTITY)
),
Hibernate3ColumnFormLayoutData.COLUMN_LIST_DEFINITION,
Hibernate3MetaFormLayoutData.META_LIST_DEFINITION,
new FormData(
- "Advanced",
+ Messages.Hibernate3IdFormLayoutData_Advanced,
"", //"Description //$NON-NLS-1$
Hibernate3FormLayoutDataUtil.createAdvancedFormAttributeData(COLLECTION_ID_ENTITY)
),
@@ -64,12 +64,12 @@
final static IFormData[] COMPOSITE_INDEX_DEFINITIONS = new IFormData[] {
new FormData(
- "Composite Index",
+ Messages.Hibernate3IdFormLayoutData_CompositeIndex,
"", //"Description //$NON-NLS-1$
Hibernate3FormLayoutDataUtil.createGeneralFormAttributeData(COMPOSITE_INDEX_ENTITY)
),
Hibernate3FormLayoutDataUtil.createChildrenFormData(
- "Key Properties", null, null,
+ Messages.Hibernate3IdFormLayoutData_IndexKeyProperties, null, null,
"name", //$NON-NLS-1$
new String[]{"Hibernate3KeyProperty", "Hibernate3KeyManyToOne"}, "CreateActions.AddKeys.AddKey"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
};
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3KeyFormLayoutData.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3KeyFormLayoutData.java 2009-07-06 00:33:40 UTC (rev 16388)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3KeyFormLayoutData.java 2009-07-06 00:42:41 UTC (rev 16389)
@@ -30,14 +30,14 @@
final static IFormData[] KEY_DEFINITIONS = new IFormData[] {
new FormData(
- "Key",
+ Messages.Hibernate3KeyFormLayoutData_Key,
"", //"Description //$NON-NLS-1$
Hibernate3FormLayoutDataUtil.createGeneralFormAttributeData(KEY_ENTITY)
),
Hibernate3ColumnFormLayoutData.COLUMN_LIST_DEFINITION,
// Hibernate3MetaFormLayoutData.META_LIST_DEFINITION,
new FormData(
- "Advanced",
+ Messages.Hibernate3KeyFormLayoutData_Advanced,
"", //"Description //$NON-NLS-1$
Hibernate3FormLayoutDataUtil.createAdvancedFormAttributeData(KEY_ENTITY)
),
@@ -49,14 +49,14 @@
final static IFormData[] KEY_MANY_TO_ONE_DEFINITIONS = new IFormData[] {
new FormData(
- "Key Many To One",
+ Messages.Hibernate3KeyFormLayoutData_KeyManyToOne,
"", //"Description //$NON-NLS-1$
Hibernate3FormLayoutDataUtil.createGeneralFormAttributeData(KEY_MANY_TO_ONE_ENTITY)
),
Hibernate3ColumnFormLayoutData.COLUMN_LIST_DEFINITION,
Hibernate3MetaFormLayoutData.META_LIST_DEFINITION,
new FormData(
- "Advanced",
+ Messages.Hibernate3KeyFormLayoutData_Advanced,
"", //"Description //$NON-NLS-1$
Hibernate3FormLayoutDataUtil.createAdvancedFormAttributeData(KEY_MANY_TO_ONE_ENTITY)
),
@@ -68,14 +68,14 @@
final static IFormData[] KEY_PROPERTY_DEFINITIONS = new IFormData[] {
new FormData(
- "Key Property",
+ Messages.Hibernate3KeyFormLayoutData_KeyProperty,
"", //"Description //$NON-NLS-1$
Hibernate3FormLayoutDataUtil.createGeneralFormAttributeData(KEY_PROPERTY_ENTITY)
),
Hibernate3ColumnFormLayoutData.COLUMN_LIST_DEFINITION,
Hibernate3MetaFormLayoutData.META_LIST_DEFINITION,
new FormData(
- "Advanced",
+ Messages.Hibernate3KeyFormLayoutData_Advanced,
"", //"Description //$NON-NLS-1$
Hibernate3FormLayoutDataUtil.createAdvancedFormAttributeData(KEY_PROPERTY_ENTITY)
),
@@ -87,14 +87,14 @@
final static IFormData[] MAP_KEY_DEFINITIONS = new IFormData[] {
new FormData(
- "Map Key",
+ Messages.Hibernate3KeyFormLayoutData_MapKey,
"", //"Description //$NON-NLS-1$
Hibernate3FormLayoutDataUtil.createGeneralFormAttributeData(MAP_KEY_ENTITY)
),
Hibernate3ColumnFormLayoutData.COLUMN_LIST_DEFINITION,
Hibernate3FormulaFormLayoutData.FORMULA_LIST_DEFINITION,
new FormData(
- "Advanced",
+ Messages.Hibernate3KeyFormLayoutData_Advanced,
"", //"Description //$NON-NLS-1$
Hibernate3FormLayoutDataUtil.createAdvancedFormAttributeData(MAP_KEY_ENTITY)
),
@@ -106,14 +106,14 @@
final static IFormData[] MAP_KEY_MANY_TO_MANY_DEFINITIONS = new IFormData[] {
new FormData(
- "Map Key Many To Many",
+ Messages.Hibernate3KeyFormLayoutData_MapKeyManyToMany,
"", //"Description //$NON-NLS-1$
Hibernate3FormLayoutDataUtil.createGeneralFormAttributeData(MAP_KEY_MANY_TO_MANY_ENTITY)
),
Hibernate3ColumnFormLayoutData.COLUMN_LIST_DEFINITION,
Hibernate3FormulaFormLayoutData.FORMULA_LIST_DEFINITION,
new FormData(
- "Advanced",
+ Messages.Hibernate3KeyFormLayoutData_Advanced,
"", //"Description //$NON-NLS-1$
Hibernate3FormLayoutDataUtil.createAdvancedFormAttributeData(MAP_KEY_MANY_TO_MANY_ENTITY)
),
@@ -125,11 +125,11 @@
final static IFormData[] COMPOSITE_MAP_KEY_DEFINITIONS = new IFormData[] {
new FormData(
- "Composite Map key",
+ Messages.Hibernate3KeyFormLayoutData_CompositeMapKey,
"", //"Description //$NON-NLS-1$
Hibernate3FormLayoutDataUtil.createGeneralFormAttributeData(COMPOSITE_MAP_KEY_ENTITY)
),
- Hibernate3FormLayoutDataUtil.createChildrenFormData("Key Properties",
+ Hibernate3FormLayoutDataUtil.createChildrenFormData(Messages.Hibernate3KeyFormLayoutData_KeyProperties,
null, null, "name", new String[]{"Hibernate3KeyProperty", "Hibernate3KeyManyToOne"}, "CreateActions.AddKeys.AddKey"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
};
@@ -139,14 +139,14 @@
final static IFormData[] INDEX_DEFINITIONS = new IFormData[] {
new FormData(
- "Index",
- "", //"Description
+ Messages.Hibernate3KeyFormLayoutData_Index,
+ "", //"Description //$NON-NLS-1$
Hibernate3FormLayoutDataUtil.createGeneralFormAttributeData(INDEX_ENTITY)
),
Hibernate3ColumnFormLayoutData.COLUMN_LIST_DEFINITION,
new FormData(
- "Advanced",
- "", //"Description
+ Messages.Hibernate3KeyFormLayoutData_Advanced,
+ "", //"Description //$NON-NLS-1$
Hibernate3FormLayoutDataUtil.createAdvancedFormAttributeData(INDEX_ENTITY)
),
};
@@ -157,8 +157,8 @@
final static IFormData[] LIST_INDEX_DEFINITIONS = new IFormData[] {
new FormData(
- "List Index",
- "", //"Description
+ Messages.Hibernate3KeyFormLayoutData_ListIndex,
+ "", //"Description //$NON-NLS-1$
Hibernate3FormLayoutDataUtil.createGeneralFormAttributeData(LIST_INDEX_ENTITY)
),
Hibernate3ColumnFormLayoutData.COLUMN_LIST_DEFINITION
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3ListFormLayoutData.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3ListFormLayoutData.java 2009-07-06 00:33:40 UTC (rev 16388)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3ListFormLayoutData.java 2009-07-06 00:42:41 UTC (rev 16389)
@@ -21,34 +21,34 @@
final static IFormData[] LIST_DEFINITIONS = new IFormData[] {
new FormData(
- "List",
+ Messages.Hibernate3ListFormLayoutData_List,
"", //"Description //$NON-NLS-1$
Hibernate3FormLayoutDataUtil.createGeneralFormAttributeData(LIST_ENTITY)
),
new FormData(
- "Key",
+ Messages.Hibernate3ListFormLayoutData_ListKey,
"", //$NON-NLS-1$
"key", //$NON-NLS-1$
Hibernate3FormLayoutDataUtil.createGeneralFormAttributeData("Hibernate3Key") //$NON-NLS-1$
),
new FormData(
- "Index",
+ Messages.Hibernate3ListFormLayoutData_ListIndex,
"", //"Description //$NON-NLS-1$
new IFormAttributeData[]{
- new FormAttributeData("index", 100, "Index Kind") //$NON-NLS-1$
+ new FormAttributeData("index", 100, Messages.Hibernate3ListFormLayoutData_ListIndexKind) //$NON-NLS-1$
}
),
new FormData(
- "Element",
+ Messages.Hibernate3ListFormLayoutData_ListElement,
"", //"Description //$NON-NLS-1$
new IFormAttributeData[]{
- new FormAttributeData("element", 100, "Element Kind") //$NON-NLS-1$
+ new FormAttributeData("element", 100, Messages.Hibernate3ListFormLayoutData_ListElementKind) //$NON-NLS-1$
}
),
Hibernate3MetaFormLayoutData.META_LIST_DEFINITION,
Hibernate3SQLQueryFormLayoutData.SYNCHRONIZES_LIST_DEFINITION,
new FormData(
- "Advanced",
+ Messages.Hibernate3ListFormLayoutData_ListAdvanced,
"", //"Description //$NON-NLS-1$
Hibernate3FormLayoutDataUtil.createAdvancedFormAttributeData(LIST_ENTITY)
),
@@ -56,34 +56,34 @@
final static IFormData[] ARRAY_DEFINITIONS = new IFormData[] {
new FormData(
- "Array",
+ Messages.Hibernate3ListFormLayoutData_Array,
"", //"Description //$NON-NLS-1$
Hibernate3FormLayoutDataUtil.createGeneralFormAttributeData(ARRAY_ENTITY)
),
new FormData(
- "Key",
+ Messages.Hibernate3ListFormLayoutData_ArrayKey,
"", //$NON-NLS-1$
"key", //$NON-NLS-1$
Hibernate3FormLayoutDataUtil.createGeneralFormAttributeData("Hibernate3Key") //$NON-NLS-1$
),
new FormData(
- "Index",
+ Messages.Hibernate3ListFormLayoutData_ArrayIndex,
"", //"Description //$NON-NLS-1$
new IFormAttributeData[]{
- new FormAttributeData("index", 100, "Index Kind") //$NON-NLS-1$
+ new FormAttributeData("index", 100, Messages.Hibernate3ListFormLayoutData_ArrayIndexKind) //$NON-NLS-1$
}
),
new FormData(
- "Element",
+ Messages.Hibernate3ListFormLayoutData_ArrayElement,
"", //"Description //$NON-NLS-1$
new IFormAttributeData[]{
- new FormAttributeData("element", 100, "Element Kind") //$NON-NLS-1$
+ new FormAttributeData("element", 100, Messages.Hibernate3ListFormLayoutData_ArrayElementKind) //$NON-NLS-1$
}
),
Hibernate3MetaFormLayoutData.META_LIST_DEFINITION,
Hibernate3SQLQueryFormLayoutData.SYNCHRONIZES_LIST_DEFINITION,
new FormData(
- "Advanced",
+ Messages.Hibernate3ListFormLayoutData_ArrayAdvanced,
"", //"Description //$NON-NLS-1$
Hibernate3FormLayoutDataUtil.createAdvancedFormAttributeData(ARRAY_ENTITY)
),
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3ManyToOneFormLayoutData.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3ManyToOneFormLayoutData.java 2009-07-06 00:33:40 UTC (rev 16388)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3ManyToOneFormLayoutData.java 2009-07-06 00:42:41 UTC (rev 16389)
@@ -21,7 +21,7 @@
final static IFormData[] MANY_TO_ONE_DEFINITIONS = new IFormData[] {
new FormData(
- "Many To One",
+ Messages.Hibernate3ManyToOneFormLayoutData_ManyToOne,
"", //"Description //$NON-NLS-1$
Hibernate3FormLayoutDataUtil.createGeneralFormAttributeData(MANY_TO_ONE_ENTITY)
),
@@ -29,7 +29,7 @@
Hibernate3FormulaFormLayoutData.FORMULA_LIST_DEFINITION,
Hibernate3MetaFormLayoutData.META_LIST_DEFINITION,
new FormData(
- "Advanced",
+ Messages.Hibernate3ManyToOneFormLayoutData_Advanced,
"", //"Description //$NON-NLS-1$
Hibernate3FormLayoutDataUtil.createAdvancedFormAttributeData(MANY_TO_ONE_ENTITY)
),
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3MapFormLayoutData.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3MapFormLayoutData.java 2009-07-06 00:33:40 UTC (rev 16388)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3MapFormLayoutData.java 2009-07-06 00:42:41 UTC (rev 16389)
@@ -16,39 +16,39 @@
import org.jboss.tools.common.model.ui.forms.IFormData;
public class Hibernate3MapFormLayoutData {
- static String MAP_ENTITY = "Hibernate3Map";
+ static String MAP_ENTITY = "Hibernate3Map"; //$NON-NLS-1$
final static IFormData[] MAP_DEFINITIONS = new IFormData[] {
new FormData(
- "Map",
+ Messages.Hibernate3MapFormLayoutData_Map,
"", //"Description //$NON-NLS-1$
Hibernate3FormLayoutDataUtil.createGeneralFormAttributeData(MAP_ENTITY)
),
new FormData(
- "Key",
+ Messages.Hibernate3MapFormLayoutData_Key,
"", //$NON-NLS-1$
"key", //$NON-NLS-1$
- Hibernate3FormLayoutDataUtil.createGeneralFormAttributeData("Hibernate3Key")
+ Hibernate3FormLayoutDataUtil.createGeneralFormAttributeData("Hibernate3Key") //$NON-NLS-1$
),
new FormData(
- "Index",
+ Messages.Hibernate3MapFormLayoutData_Index,
"", //"Description //$NON-NLS-1$
new IFormAttributeData[]{
- new FormAttributeData("index", 100, "Index Kind") //$NON-NLS-1$
+ new FormAttributeData("index", 100, Messages.Hibernate3MapFormLayoutData_IndexKind) //$NON-NLS-1$
}
),
new FormData(
- "Element",
+ Messages.Hibernate3MapFormLayoutData_Element,
"", //"Description //$NON-NLS-1$
new IFormAttributeData[]{
- new FormAttributeData("element", 100, "Element Kind") //$NON-NLS-1$
+ new FormAttributeData("element", 100, Messages.Hibernate3MapFormLayoutData_ElementKind) //$NON-NLS-1$
}
),
Hibernate3MetaFormLayoutData.META_LIST_DEFINITION,
Hibernate3SQLQueryFormLayoutData.SYNCHRONIZES_LIST_DEFINITION,
Hibernate3FilterFormLayoutData.FILTER_LIST_DEFINITION,
new FormData(
- "Advanced",
+ Messages.Hibernate3MapFormLayoutData_Advanced,
"", //"Description //$NON-NLS-1$
Hibernate3FormLayoutDataUtil.createAdvancedFormAttributeData(MAP_ENTITY)
),
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3MetaFormLayoutData.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3MetaFormLayoutData.java 2009-07-06 00:33:40 UTC (rev 16388)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3MetaFormLayoutData.java 2009-07-06 00:42:41 UTC (rev 16389)
@@ -22,40 +22,40 @@
static String TUPLIZER_ENTITY = "Hibernate3Tuplizer"; //$NON-NLS-1$
final static IFormData META_LIST_DEFINITION = new FormData(
- "Meta",
+ Messages.Hibernate3MetaFormLayoutData_List,
"", //Description //$NON-NLS-1$
"Meta", //$NON-NLS-1$
new FormAttributeData[]{
- new FormAttributeData("attribute", 30, "attribute"), //$NON-NLS-1$
- new FormAttributeData("value", 70, "value")}, //$NON-NLS-1$
+ new FormAttributeData("attribute", 30, Messages.Hibernate3MetaFormLayoutData_Attr), //$NON-NLS-1$
+ new FormAttributeData("value", 70, Messages.Hibernate3MetaFormLayoutData_Value)}, //$NON-NLS-1$
new String[]{META_ENTITY},
Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddMeta") //$NON-NLS-1$
);
final static IFormData META_FOLDER_DEFINITION = new FormData(
- "Meta",
+ Messages.Hibernate3MetaFormLayoutData_Folder,
"", //"Description //$NON-NLS-1$
"Hibernate3MetaFolder", //$NON-NLS-1$
new FormAttributeData[]{
- new FormAttributeData("attribute", 30, "attribute"), //$NON-NLS-1$
- new FormAttributeData("value", 70, "value")}, //$NON-NLS-1$
+ new FormAttributeData("attribute", 30, Messages.Hibernate3MetaFormLayoutData_Attr), //$NON-NLS-1$
+ new FormAttributeData("value", 70, Messages.Hibernate3MetaFormLayoutData_Value)}, //$NON-NLS-1$
new String[]{META_ENTITY},
Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddMeta") //$NON-NLS-1$
);
final static IFormData TUPLIZER_LIST_DEFINITION = new FormData(
- "Tuplizers",
+ Messages.Hibernate3MetaFormLayoutData_TuplizersList,
"", //"Description //$NON-NLS-1$
"Tuplizers", //$NON-NLS-1$
- new FormAttributeData[]{new FormAttributeData("attribute", 100, "class")}, //$NON-NLS-1$
+ new FormAttributeData[]{new FormAttributeData("attribute", 100, Messages.Hibernate3MetaFormLayoutData_Class)}, //$NON-NLS-1$
new String[]{TUPLIZER_ENTITY},
Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddTuplizer") //$NON-NLS-1$
);
final static IFormData TUPLIZER_FOLDER_DEFINITION = new FormData(
- "Tuplizers",
+ Messages.Hibernate3MetaFormLayoutData_TuplizersFolder,
"", //"Description //$NON-NLS-1$
"Hibernate3TuplizerFolder", //$NON-NLS-1$
- new FormAttributeData[]{new FormAttributeData("attribute", 100, "class")}, //$NON-NLS-1$
+ new FormAttributeData[]{new FormAttributeData("attribute", 100, Messages.Hibernate3MetaFormLayoutData_Class)}, //$NON-NLS-1$
new String[]{TUPLIZER_ENTITY},
Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddTuplizer") //$NON-NLS-1$
);
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3OneToOneFormLayoutData.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3OneToOneFormLayoutData.java 2009-07-06 00:33:40 UTC (rev 16388)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3OneToOneFormLayoutData.java 2009-07-06 00:42:41 UTC (rev 16389)
@@ -21,13 +21,13 @@
final static IFormData[] ONE_TO_ONE_DEFINITIONS = new IFormData[] {
new FormData(
- "One To One",
+ Messages.Hibernate3OneToOneFormLayoutData_OneToOne,
"", //"Description //$NON-NLS-1$
Hibernate3FormLayoutDataUtil.createGeneralFormAttributeData(ONE_TO_ONE_ENTITY)
),
Hibernate3MetaFormLayoutData.META_LIST_DEFINITION,
new FormData(
- "Advanced",
+ Messages.Hibernate3OneToOneFormLayoutData_Advanced,
"", //"Description //$NON-NLS-1$
Hibernate3FormLayoutDataUtil.createAdvancedFormAttributeData(ONE_TO_ONE_ENTITY)
),
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3PropertyFormLayoutData.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3PropertyFormLayoutData.java 2009-07-06 00:33:40 UTC (rev 16388)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3PropertyFormLayoutData.java 2009-07-06 00:42:41 UTC (rev 16389)
@@ -20,7 +20,7 @@
static String PROPERTY_ENTITY = "Hibernate3Property"; //$NON-NLS-1$
final static IFormData[] PROPERTY_DEFINITIONS = new IFormData[] {
new FormData(
- "Property",
+ Messages.Hibernate3PropertyFormLayoutData_Property,
"", //"Description //$NON-NLS-1$
Hibernate3FormLayoutDataUtil.createGeneralFormAttributeData(PROPERTY_ENTITY)
),
@@ -28,7 +28,7 @@
Hibernate3FormulaFormLayoutData.FORMULA_LIST_DEFINITION,
Hibernate3MetaFormLayoutData.META_LIST_DEFINITION,
new FormData(
- "Advanced",
+ Messages.Hibernate3PropertyFormLayoutData_Advanced,
"", //"Description //$NON-NLS-1$
Hibernate3FormLayoutDataUtil.createAdvancedFormAttributeData(PROPERTY_ENTITY)
),
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3SQLQueryFormLayoutData.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3SQLQueryFormLayoutData.java 2009-07-06 00:33:40 UTC (rev 16388)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3SQLQueryFormLayoutData.java 2009-07-06 00:42:41 UTC (rev 16389)
@@ -23,7 +23,7 @@
static String RESULT_SET_ENTITY = "Hibernate3ResultSet"; //$NON-NLS-1$
static IFormData SYNCHRONIZES_LIST_DEFINITION = new FormData(
- "Synchronize",
+ Messages.Hibernate3SQLQueryFormLayoutData_SyncList,
"", //"Description //$NON-NLS-1$
new FormAttributeData[]{new FormAttributeData("table", 100)}, //$NON-NLS-1$
new String[]{SYNCHRONIZES_ENTITY},
@@ -31,7 +31,7 @@
);
static IFormData SYNCHRONIZES_FOLDER_DEFINITION = new FormData(
- "Synchronize",
+ Messages.Hibernate3SQLQueryFormLayoutData_SyncFolder,
"", //"Description //$NON-NLS-1$
"Synchronize", //$NON-NLS-1$
new FormAttributeData[]{new FormAttributeData("table", 100)}, //$NON-NLS-1$
@@ -41,19 +41,19 @@
final static IFormData[] SQL_QUERY_DEFINITIONS = new IFormData[] {
new FormData(
- "SQL Query",
+ Messages.Hibernate3SQLQueryFormLayoutData_SQLQuery,
"", //"Description //$NON-NLS-1$
Hibernate3FormLayoutDataUtil.createGeneralFormAttributeData(SQL_QUERY_ENTITY)
),
new FormData(
- "Returns",
+ Messages.Hibernate3SQLQueryFormLayoutData_QueryReturns,
"", //"Description //$NON-NLS-1$
new FormAttributeData[]{new FormAttributeData("alias", 100)}, //$NON-NLS-1$
new String[]{"Hibernate3Return", "Hibernate3ReturnJoin", "Hibernate3LoadCollection"}, //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.Returns.AddAnyReturn") //$NON-NLS-1$
),
new FormData(
- "Return Scalars",
+ Messages.Hibernate3SQLQueryFormLayoutData_QueryReturnScalars,
"", //"Description //$NON-NLS-1$
new FormAttributeData[]{new FormAttributeData("column", 40), new FormAttributeData("type", 60)}, //$NON-NLS-1$ //$NON-NLS-2$
new String[]{"Hibernate3ReturnScalar"}, //$NON-NLS-1$
@@ -61,7 +61,7 @@
),
SYNCHRONIZES_LIST_DEFINITION,
new FormData(
- "Advanced",
+ Messages.Hibernate3SQLQueryFormLayoutData_QueryAdvanced,
"", //"Description //$NON-NLS-1$
Hibernate3FormLayoutDataUtil.createAdvancedFormAttributeData(SQL_QUERY_ENTITY)
),
@@ -69,26 +69,26 @@
final static IFormData[] RESULT_SET_DEFINITIONS = new IFormData[] {
new FormData(
- "Result Set",
+ Messages.Hibernate3SQLQueryFormLayoutData_ResultSet,
"", //"Description //$NON-NLS-1$
Hibernate3FormLayoutDataUtil.createGeneralFormAttributeData(RESULT_SET_ENTITY)
),
new FormData(
- "Returns",
+ Messages.Hibernate3SQLQueryFormLayoutData_ResultSetReturns,
"", //"Description //$NON-NLS-1$
new FormAttributeData[]{new FormAttributeData("alias", 100)}, //$NON-NLS-1$
new String[]{"Hibernate3Return", "Hibernate3ReturnJoin", "Hibernate3LoadCollection"}, //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.Returns.AddAnyReturn") //$NON-NLS-1$
),
new FormData(
- "Return Scalars",
+ Messages.Hibernate3SQLQueryFormLayoutData_ResultSetReturnScalars,
"", //"Description //$NON-NLS-1$
new FormAttributeData[]{new FormAttributeData("column", 40), new FormAttributeData("type", 60)}, //$NON-NLS-1$ //$NON-NLS-2$
new String[]{"Hibernate3ReturnScalar"}, //$NON-NLS-1$
Hibernate3FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddReturnScalar") //$NON-NLS-1$
),
new FormData(
- "Advanced",
+ Messages.Hibernate3SQLQueryFormLayoutData_ResultSetAdvanced,
"", //"Description //$NON-NLS-1$
Hibernate3FormLayoutDataUtil.createAdvancedFormAttributeData(RESULT_SET_ENTITY)
),
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3SetFormLayoutData.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3SetFormLayoutData.java 2009-07-06 00:33:40 UTC (rev 16388)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/form/Hibernate3SetFormLayoutData.java 2009-07-06 00:42:41 UTC (rev 16389)
@@ -21,28 +21,28 @@
final static IFormData[] SET_DEFINITIONS = new IFormData[] {
new FormData(
- "Set",
+ Messages.Hibernate3SetFormLayoutData_Set,
"", //"Description //$NON-NLS-1$
Hibernate3FormLayoutDataUtil.createGeneralFormAttributeData(SET_ENTITY)
),
new FormData(
- "Key",
+ Messages.Hibernate3SetFormLayoutData_SetKey,
"", //$NON-NLS-1$
"key", //$NON-NLS-1$
Hibernate3FormLayoutDataUtil.createGeneralFormAttributeData("Hibernate3Key") //$NON-NLS-1$
),
new FormData(
- "Element",
+ Messages.Hibernate3SetFormLayoutData_SetElement,
"", //"Description //$NON-NLS-1$
new IFormAttributeData[]{
- new FormAttributeData("element", 100, "Element Kind") //$NON-NLS-1$
+ new FormAttributeData("element", 100, Messages.Hibernate3SetFormLayoutData_SetElementKind) //$NON-NLS-1$
}
),
Hibernate3MetaFormLayoutData.META_LIST_DEFINITION,
Hibernate3SQLQueryFormLayoutData.SYNCHRONIZES_LIST_DEFINITION,
Hibernate3FilterFormLayoutData.FILTER_LIST_DEFINITION,
new FormData(
- "Advanced",
+ Messages.Hibernate3SetFormLayoutData_SetAdvanced,
"", //"Description //$NON-NLS-1$
Hibernate3FormLayoutDataUtil.createAdvancedFormAttributeData(SET_ENTITY)
),
@@ -50,28 +50,28 @@
final static IFormData[] BAG_DEFINITIONS = new IFormData[] {
new FormData(
- "Bag",
+ Messages.Hibernate3SetFormLayoutData_Bag,
"", //"Description //$NON-NLS-1$
Hibernate3FormLayoutDataUtil.createGeneralFormAttributeData(BAG_ENTITY)
),
new FormData(
- "Key",
+ Messages.Hibernate3SetFormLayoutData_BagKey,
"", //$NON-NLS-1$
"key", //$NON-NLS-1$
Hibernate3FormLayoutDataUtil.createGeneralFormAttributeData("Hibernate3Key") //$NON-NLS-1$
),
new FormData(
- "Element",
+ Messages.Hibernate3SetFormLayoutData_BagElement,
"", //"Description //$NON-NLS-1$
new IFormAttributeData[]{
- new FormAttributeData("element", 100, "Element Kind") //$NON-NLS-1$
+ new FormAttributeData("element", 100, Messages.Hibernate3SetFormLayoutData_BagElementKind) //$NON-NLS-1$
}
),
Hibernate3MetaFormLayoutData.META_LIST_DEFINITION,
Hibernate3SQLQueryFormLayoutData.SYNCHRONIZES_LIST_DEFINITION,
Hibernate3FilterFormLayoutData.FILTER_LIST_DEFINITION,
new FormData(
- "Advanced",
+ Messages.Hibernate3SetFormLayoutData_BagAdvanced,
"", //"Description //$NON-NLS-1$
Hibernate3FormLayoutDataUtil.createAdvancedFormAttributeData(BAG_ENTITY)
),
14 years, 10 months
- 1
- 0
JBoss Tools SVN: r16388 - trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/src/org/jboss/ide/eclipse/as/archives/integration/test.
by jbosstools-commits＠lists.jboss.org
Author: sflanigan
Date: 2009-07-05 20:33:40 -0400 (Sun, 05 Jul 2009)
New Revision: 16388
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/src/org/jboss/ide/eclipse/as/archives/integration/test/ASArchivesIntegrationTest.java
trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/src/org/jboss/ide/eclipse/as/archives/integration/test/ASArchivesIntegrationTestSuite.java
trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/src/org/jboss/ide/eclipse/as/archives/integration/test/BuildDeployTest.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3557 Externalize English strings (annotating tests to disable nls warnings)
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/src/org/jboss/ide/eclipse/as/archives/integration/test/ASArchivesIntegrationTest.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/src/org/jboss/ide/eclipse/as/archives/integration/test/ASArchivesIntegrationTest.java 2009-07-05 16:37:44 UTC (rev 16387)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/src/org/jboss/ide/eclipse/as/archives/integration/test/ASArchivesIntegrationTest.java 2009-07-06 00:33:40 UTC (rev 16388)
@@ -27,6 +27,7 @@
/**
* The activator class controls the plug-in life cycle
*/
+@SuppressWarnings("nls")
public class ASArchivesIntegrationTest extends Plugin {
// The plug-in ID
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/src/org/jboss/ide/eclipse/as/archives/integration/test/ASArchivesIntegrationTestSuite.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/src/org/jboss/ide/eclipse/as/archives/integration/test/ASArchivesIntegrationTestSuite.java 2009-07-05 16:37:44 UTC (rev 16387)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/src/org/jboss/ide/eclipse/as/archives/integration/test/ASArchivesIntegrationTestSuite.java 2009-07-06 00:33:40 UTC (rev 16388)
@@ -24,6 +24,7 @@
import junit.framework.Test;
import junit.framework.TestSuite;
+@SuppressWarnings("nls")
public class ASArchivesIntegrationTestSuite extends TestSuite {
public static Test suite() {
TestSuite suite = new TestSuite("AS Archives Integration Test Suite");
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/src/org/jboss/ide/eclipse/as/archives/integration/test/BuildDeployTest.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/src/org/jboss/ide/eclipse/as/archives/integration/test/BuildDeployTest.java 2009-07-05 16:37:44 UTC (rev 16387)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/src/org/jboss/ide/eclipse/as/archives/integration/test/BuildDeployTest.java 2009-07-06 00:33:40 UTC (rev 16388)
@@ -47,6 +47,7 @@
import org.jboss.ide.eclipse.as.core.server.internal.DeployableServer;
import org.jboss.tools.test.util.JobUtils;
+@SuppressWarnings("nls")
public class BuildDeployTest extends TestCase {
private static final String VALUE_PREFIX = "value";
private static final String OUT_JAR = "out.jar";
14 years, 10 months
- 1
- 0
JBoss Tools SVN: r16387 - trunk/jbpm/plugins/org.jboss.tools.jbpm.common.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2009-07-05 12:37:44 -0400 (Sun, 05 Jul 2009)
New Revision: 16387
Modified:
trunk/jbpm/plugins/org.jboss.tools.jbpm.common/plugin.xml
Log:
reorganizing wizards
Modified: trunk/jbpm/plugins/org.jboss.tools.jbpm.common/plugin.xml
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.jbpm.common/plugin.xml 2009-07-05 16:37:05 UTC (rev 16386)
+++ trunk/jbpm/plugins/org.jboss.tools.jbpm.common/plugin.xml 2009-07-05 16:37:44 UTC (rev 16387)
@@ -16,5 +16,12 @@
id="org.jboss.tools.jbpm">
</category>
</extension>
+ <extension
+ point="org.eclipse.ui.views">
+ <category
+ id="org.jboss.tools.jbpm"
+ name="JBoss jBPM">
+ </category>
+ </extension>
</plugin>
14 years, 10 months
- 1
- 0
JBoss Tools SVN: r16386 - in trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4: src/org/jboss/tools/flow/jpdl4/editpart and 5 other directories.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2009-07-05 12:37:05 -0400 (Sun, 05 Jul 2009)
New Revision: 16386
Added:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/QueryTaskTreeRootEditPart.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/QueryTaskDeserializer.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/QueryTaskSerializer.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/QueryTask.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/QueryTaskQuerySection.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/QueryTaskUniqueSection.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/QueryTaskVariableNameSection.java
Removed:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/HqlTaskTreeRootEditPart.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/HqlTaskDeserializer.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/HqlTaskSerializer.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/HqlTaskQuerySection.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/HqlTaskUniqueSection.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/HqlTaskVariableNameSection.java
Modified:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/JpdlTreeEditPartFactory.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/handler/AddParameterHandler.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/Registry.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/HqlTask.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/SqlTask.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/view/DetailsPage.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/view/DetailsView.java
Log:
SqlTask configuration is now supported
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml 2009-07-05 16:02:25 UTC (rev 16385)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml 2009-07-05 16:37:05 UTC (rev 16386)
@@ -622,24 +622,24 @@
</propertySection>
<propertySection
afterSection="org.jboss.tools.jpdl4.name"
- class="org.jboss.tools.flow.jpdl4.properties.HqlTaskVariableNameSection"
+ class="org.jboss.tools.flow.jpdl4.properties.QueryTaskVariableNameSection"
id="org.jboss.tools.jpdl4.hqlTask.variableName"
tab="org.jboss.tools.jpdl4.general">
- <input type="org.jboss.tools.flow.jpdl4.model.HqlTask"/>
+ <input type="org.jboss.tools.flow.jpdl4.model.QueryTask"/>
</propertySection>
<propertySection
afterSection="org.jboss.tools.jpdl4.hqlTask.variableName"
- class="org.jboss.tools.flow.jpdl4.properties.HqlTaskUniqueSection"
+ class="org.jboss.tools.flow.jpdl4.properties.QueryTaskUniqueSection"
id="org.jboss.tools.jpdl4.hqlTask.unique"
tab="org.jboss.tools.jpdl4.general">
- <input type="org.jboss.tools.flow.jpdl4.model.HqlTask"/>
+ <input type="org.jboss.tools.flow.jpdl4.model.QueryTask"/>
</propertySection>
<propertySection
afterSection="org.jboss.tools.jpdl4.hqlTask.unique"
- class="org.jboss.tools.flow.jpdl4.properties.HqlTaskQuerySection"
+ class="org.jboss.tools.flow.jpdl4.properties.QueryTaskQuerySection"
id="org.jboss.tools.jpdl4.hqlTask.query"
tab="org.jboss.tools.jpdl4.general">
- <input type="org.jboss.tools.flow.jpdl4.model.HqlTask"/>
+ <input type="org.jboss.tools.flow.jpdl4.model.QueryTask"/>
</propertySection>
<propertySection
class="org.jboss.tools.flow.jpdl4.properties.PrimitiveObjectValueSection"
@@ -856,7 +856,7 @@
<iterate>
<or>
<instanceof
- value="org.jboss.tools.flow.jpdl4.editpart.HqlTaskTreeRootEditPart">
+ value="org.jboss.tools.flow.jpdl4.editpart.QueryTaskTreeRootEditPart">
</instanceof>
<instanceof
value="org.jboss.tools.flow.jpdl4.editpart.ParameterListTreeEditPart">
Deleted: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/HqlTaskTreeRootEditPart.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/HqlTaskTreeRootEditPart.java 2009-07-05 16:02:25 UTC (rev 16385)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/HqlTaskTreeRootEditPart.java 2009-07-05 16:37:05 UTC (rev 16386)
@@ -1,30 +0,0 @@
-package org.jboss.tools.flow.jpdl4.editpart;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.jboss.tools.flow.common.model.Element;
-import org.jboss.tools.flow.common.wrapper.Wrapper;
-import org.jboss.tools.flow.jpdl4.model.HqlTask;
-
-public class HqlTaskTreeRootEditPart extends TaskTreeRootEditPart {
-
- public HqlTaskTreeRootEditPart(Wrapper wrapper) {
- super(wrapper);
- }
-
- protected List<Object> getModelChildren() {
- List<Object> result = new ArrayList<Object>();
- addParameters(result, (Wrapper)getModel());
- result.addAll(super.getModelChildren());
- return result;
- }
-
- private void addParameters(List<Object> list, Wrapper wrapper) {
- List<Element> parameters = wrapper.getChildren(HqlTask.PARAMETERS);
- if (parameters != null && !parameters.isEmpty()) {
- list.add(new ParameterListTreeEditPart(parameters));
- }
- }
-
-}
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/JpdlTreeEditPartFactory.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/JpdlTreeEditPartFactory.java 2009-07-05 16:02:25 UTC (rev 16385)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/JpdlTreeEditPartFactory.java 2009-07-05 16:37:05 UTC (rev 16386)
@@ -11,10 +11,10 @@
import org.jboss.tools.flow.jpdl4.model.EventListener;
import org.jboss.tools.flow.jpdl4.model.EventListenerContainer;
import org.jboss.tools.flow.jpdl4.model.Field;
-import org.jboss.tools.flow.jpdl4.model.HqlTask;
import org.jboss.tools.flow.jpdl4.model.JavaTask;
import org.jboss.tools.flow.jpdl4.model.Parameter;
import org.jboss.tools.flow.jpdl4.model.PrimitiveObject;
+import org.jboss.tools.flow.jpdl4.model.QueryTask;
import org.jboss.tools.flow.jpdl4.model.SubprocessTask;
import org.jboss.tools.flow.jpdl4.model.Swimlane;
import org.jboss.tools.flow.jpdl4.model.Timer;
@@ -27,7 +27,7 @@
Element element = ((NodeWrapper)model).getElement();
if (element instanceof SubprocessTask) return new SubprocessTaskTreeRootEditPart((Wrapper)model);
if (element instanceof JavaTask) return new JavaTaskTreeRootEditPart((Wrapper)model);
- if (element instanceof HqlTask) return new HqlTaskTreeRootEditPart((Wrapper)model);
+ if (element instanceof QueryTask) return new QueryTaskTreeRootEditPart((Wrapper)model);
return new TaskTreeRootEditPart((NodeWrapper)model);
}
if (model instanceof ConnectionWrapper && context == null) return new SequenceFlowTreeRootEditPart((ConnectionWrapper)model);
Copied: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/QueryTaskTreeRootEditPart.java (from rev 16344, trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/HqlTaskTreeRootEditPart.java)
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/QueryTaskTreeRootEditPart.java (rev 0)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/QueryTaskTreeRootEditPart.java 2009-07-05 16:37:05 UTC (rev 16386)
@@ -0,0 +1,30 @@
+package org.jboss.tools.flow.jpdl4.editpart;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.jboss.tools.flow.common.model.Element;
+import org.jboss.tools.flow.common.wrapper.Wrapper;
+import org.jboss.tools.flow.jpdl4.model.QueryTask;
+
+public class QueryTaskTreeRootEditPart extends TaskTreeRootEditPart {
+
+ public QueryTaskTreeRootEditPart(Wrapper wrapper) {
+ super(wrapper);
+ }
+
+ protected List<Object> getModelChildren() {
+ List<Object> result = new ArrayList<Object>();
+ addParameters(result, (Wrapper)getModel());
+ result.addAll(super.getModelChildren());
+ return result;
+ }
+
+ private void addParameters(List<Object> list, Wrapper wrapper) {
+ List<Element> parameters = wrapper.getChildren(QueryTask.PARAMETERS);
+ if (parameters != null && !parameters.isEmpty()) {
+ list.add(new ParameterListTreeEditPart(parameters));
+ }
+ }
+
+}
Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/QueryTaskTreeRootEditPart.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/handler/AddParameterHandler.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/handler/AddParameterHandler.java 2009-07-05 16:02:25 UTC (rev 16385)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/handler/AddParameterHandler.java 2009-07-05 16:37:05 UTC (rev 16386)
@@ -1,6 +1,6 @@
package org.jboss.tools.flow.jpdl4.handler;
-import org.jboss.tools.flow.jpdl4.model.HqlTask;
+import org.jboss.tools.flow.jpdl4.model.QueryTask;
public class AddParameterHandler extends AddChildHandler {
@@ -11,7 +11,7 @@
@Override
protected String getChildType() {
- return HqlTask.PARAMETERS;
+ return QueryTask.PARAMETERS;
}
}
Deleted: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/HqlTaskDeserializer.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/HqlTaskDeserializer.java 2009-07-05 16:02:25 UTC (rev 16385)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/HqlTaskDeserializer.java 2009-07-05 16:37:05 UTC (rev 16386)
@@ -1,67 +0,0 @@
-/**
- *
- */
-package org.jboss.tools.flow.jpdl4.io;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.jboss.tools.flow.common.wrapper.Wrapper;
-import org.jboss.tools.flow.jpdl4.model.HqlTask;
-import org.jboss.tools.flow.jpdl4.model.PrimitiveObject;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-class HqlTaskDeserializer extends NodeDeserializer {
-
- public void deserializeAttributes(Wrapper wrapper, Element element) {
- super.deserializeAttributes(wrapper, element);
- wrapper.setPropertyValue(HqlTask.VAR, element.getAttribute("var"));
- wrapper.setPropertyValue(HqlTask.UNIQUE, element.getAttribute("unique"));
- }
-
- public void deserializeChildNodes(Wrapper wrapper,
- Element element) {
- if (wrapper == null) return;
- NodeList nodeList = element.getChildNodes();
- ArrayList<Node> unknownNodeList = new ArrayList<Node>();
- for (int i = 0; i < nodeList.getLength(); i++) {
- Node node = nodeList.item(i);
- if ("query".equals(node.getNodeName())) {
- deserializeQuery(wrapper, node, unknownNodeList);
- } else if ("parameters".equals(node.getNodeName())) {
- deserializeParameters(wrapper, node, unknownNodeList);
- } else {
- deserializeChildNode(wrapper, node, unknownNodeList);
- }
- }
- wrapper.getElement().setMetaData("trailingNodes", unknownNodeList);
- }
-
- private void deserializeQuery(Wrapper parent, Node node, List<Node> unknownNodeList) {
- parent.setMetaData("beforeQueryNodes", new ArrayList<Node>(unknownNodeList));
- unknownNodeList.clear();
- // the query has only one child node
- Node content = node.getChildNodes().item(0);
- parent.setPropertyValue(HqlTask.QUERY, content.getNodeValue());
- }
-
- private void deserializeParameters(Wrapper parent, Node node, List<Node> unknownNodeList) {
- parent.setMetaData("beforeParametersNodes", new ArrayList<Node>(unknownNodeList));
- unknownNodeList.clear();
- // the actual parameters are the children of the <parameters> element
- NodeList nodeList = node.getChildNodes();
- for (int i = 0; i < nodeList.getLength(); i++) {
- Wrapper childWrapper = deserializeChildNode(parent, nodeList.item(i));
- if (childWrapper != null && childWrapper.getElement() instanceof PrimitiveObject) {
- parent.addChild(HqlTask.PARAMETERS, childWrapper);
- childWrapper.getElement().setMetaData("leadingNodes", new ArrayList<Node>(unknownNodeList));
- unknownNodeList.clear();
- } else {
- unknownNodeList.add(node);
- }
- }
- }
-
-}
\ No newline at end of file
Deleted: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/HqlTaskSerializer.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/HqlTaskSerializer.java 2009-07-05 16:02:25 UTC (rev 16385)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/HqlTaskSerializer.java 2009-07-05 16:37:05 UTC (rev 16386)
@@ -1,55 +0,0 @@
-/**
- *
- */
-package org.jboss.tools.flow.jpdl4.io;
-
-import java.util.List;
-
-import org.jboss.tools.flow.common.model.Element;
-import org.jboss.tools.flow.common.wrapper.Wrapper;
-import org.jboss.tools.flow.jpdl4.model.HqlTask;
-
-class HqlTaskSerializer extends ProcessNodeSerializer {
-
- protected List<String> getAttributesToSave() {
- List<String> result = super.getAttributesToSave();
- result.add("var");
- result.add("unique");
- return result;
- }
-
- protected String getPropertyName(String attributeName) {
- if ("var".equals(attributeName)) {
- return HqlTask.VAR;
- } else if ("unique".equals(attributeName)) {
- return HqlTask.UNIQUE;
- }
- return super.getPropertyName(attributeName);
- }
-
- public void appendBody(StringBuffer buffer, Wrapper wrapper, int level) {
- String query = (String)wrapper.getPropertyValue(HqlTask.QUERY);
- if (query != null && !"".equals(query)) {
- appendQuery(buffer, wrapper, query, level+1);
- }
- List<Element> parameters =wrapper.getChildren(HqlTask.PARAMETERS);
- if (parameters != null) {
- appendParameters(buffer, wrapper, parameters, level+1);
- }
- super.appendBody(buffer, wrapper, level);
- }
-
- private void appendQuery(StringBuffer buffer, Wrapper wrapper, String query, int level) {
- appendUnknownNodes("beforeQueryNodes", buffer, wrapper, level);
- buffer.append("<query>").append(query).append("</query>");
- }
-
- private void appendParameters(StringBuffer buffer, Wrapper wrapper, List<Element> parameters, int level) {
- appendUnknownNodes("beforeParametersNodes", buffer, wrapper, level);
- for (Element parameter : parameters) {
- if (parameter instanceof Wrapper) {
- JpdlSerializer.serialize((Wrapper)parameter, buffer, level+1);
- }
- }
- }
-}
\ No newline at end of file
Copied: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/QueryTaskDeserializer.java (from rev 16383, trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/HqlTaskDeserializer.java)
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/QueryTaskDeserializer.java (rev 0)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/QueryTaskDeserializer.java 2009-07-05 16:37:05 UTC (rev 16386)
@@ -0,0 +1,67 @@
+/**
+ *
+ */
+package org.jboss.tools.flow.jpdl4.io;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.jboss.tools.flow.common.wrapper.Wrapper;
+import org.jboss.tools.flow.jpdl4.model.PrimitiveObject;
+import org.jboss.tools.flow.jpdl4.model.QueryTask;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+class QueryTaskDeserializer extends NodeDeserializer {
+
+ public void deserializeAttributes(Wrapper wrapper, Element element) {
+ super.deserializeAttributes(wrapper, element);
+ wrapper.setPropertyValue(QueryTask.VAR, element.getAttribute("var"));
+ wrapper.setPropertyValue(QueryTask.UNIQUE, element.getAttribute("unique"));
+ }
+
+ public void deserializeChildNodes(Wrapper wrapper,
+ Element element) {
+ if (wrapper == null) return;
+ NodeList nodeList = element.getChildNodes();
+ ArrayList<Node> unknownNodeList = new ArrayList<Node>();
+ for (int i = 0; i < nodeList.getLength(); i++) {
+ Node node = nodeList.item(i);
+ if ("query".equals(node.getNodeName())) {
+ deserializeQuery(wrapper, node, unknownNodeList);
+ } else if ("parameters".equals(node.getNodeName())) {
+ deserializeParameters(wrapper, node, unknownNodeList);
+ } else {
+ deserializeChildNode(wrapper, node, unknownNodeList);
+ }
+ }
+ wrapper.getElement().setMetaData("trailingNodes", unknownNodeList);
+ }
+
+ private void deserializeQuery(Wrapper parent, Node node, List<Node> unknownNodeList) {
+ parent.setMetaData("beforeQueryNodes", new ArrayList<Node>(unknownNodeList));
+ unknownNodeList.clear();
+ // the query has only one child node
+ Node content = node.getChildNodes().item(0);
+ parent.setPropertyValue(QueryTask.QUERY, content.getNodeValue());
+ }
+
+ private void deserializeParameters(Wrapper parent, Node node, List<Node> unknownNodeList) {
+ parent.setMetaData("beforeParametersNodes", new ArrayList<Node>(unknownNodeList));
+ unknownNodeList.clear();
+ // the actual parameters are the children of the <parameters> element
+ NodeList nodeList = node.getChildNodes();
+ for (int i = 0; i < nodeList.getLength(); i++) {
+ Wrapper childWrapper = deserializeChildNode(parent, nodeList.item(i));
+ if (childWrapper != null && childWrapper.getElement() instanceof PrimitiveObject) {
+ parent.addChild(QueryTask.PARAMETERS, childWrapper);
+ childWrapper.getElement().setMetaData("leadingNodes", new ArrayList<Node>(unknownNodeList));
+ unknownNodeList.clear();
+ } else {
+ unknownNodeList.add(node);
+ }
+ }
+ }
+
+}
\ No newline at end of file
Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/QueryTaskDeserializer.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/QueryTaskSerializer.java (from rev 16383, trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/HqlTaskSerializer.java)
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/QueryTaskSerializer.java (rev 0)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/QueryTaskSerializer.java 2009-07-05 16:37:05 UTC (rev 16386)
@@ -0,0 +1,55 @@
+/**
+ *
+ */
+package org.jboss.tools.flow.jpdl4.io;
+
+import java.util.List;
+
+import org.jboss.tools.flow.common.model.Element;
+import org.jboss.tools.flow.common.wrapper.Wrapper;
+import org.jboss.tools.flow.jpdl4.model.QueryTask;
+
+class QueryTaskSerializer extends ProcessNodeSerializer {
+
+ protected List<String> getAttributesToSave() {
+ List<String> result = super.getAttributesToSave();
+ result.add("var");
+ result.add("unique");
+ return result;
+ }
+
+ protected String getPropertyName(String attributeName) {
+ if ("var".equals(attributeName)) {
+ return QueryTask.VAR;
+ } else if ("unique".equals(attributeName)) {
+ return QueryTask.UNIQUE;
+ }
+ return super.getPropertyName(attributeName);
+ }
+
+ public void appendBody(StringBuffer buffer, Wrapper wrapper, int level) {
+ String query = (String)wrapper.getPropertyValue(QueryTask.QUERY);
+ if (query != null && !"".equals(query)) {
+ appendQuery(buffer, wrapper, query, level+1);
+ }
+ List<Element> parameters =wrapper.getChildren(QueryTask.PARAMETERS);
+ if (parameters != null) {
+ appendParameters(buffer, wrapper, parameters, level+1);
+ }
+ super.appendBody(buffer, wrapper, level);
+ }
+
+ private void appendQuery(StringBuffer buffer, Wrapper wrapper, String query, int level) {
+ appendUnknownNodes("beforeQueryNodes", buffer, wrapper, level);
+ buffer.append("<query>").append(query).append("</query>");
+ }
+
+ private void appendParameters(StringBuffer buffer, Wrapper wrapper, List<Element> parameters, int level) {
+ appendUnknownNodes("beforeParametersNodes", buffer, wrapper, level);
+ for (Element parameter : parameters) {
+ if (parameter instanceof Wrapper) {
+ JpdlSerializer.serialize((Wrapper)parameter, buffer, level+1);
+ }
+ }
+ }
+}
\ No newline at end of file
Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/QueryTaskSerializer.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/Registry.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/Registry.java 2009-07-05 16:02:25 UTC (rev 16385)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/Registry.java 2009-07-05 16:37:05 UTC (rev 16386)
@@ -16,7 +16,6 @@
import org.jboss.tools.flow.jpdl4.model.ExclusiveGateway;
import org.jboss.tools.flow.jpdl4.model.Field;
import org.jboss.tools.flow.jpdl4.model.ForkParallelGateway;
-import org.jboss.tools.flow.jpdl4.model.HqlTask;
import org.jboss.tools.flow.jpdl4.model.HumanTask;
import org.jboss.tools.flow.jpdl4.model.JavaTask;
import org.jboss.tools.flow.jpdl4.model.JoinParallelGateway;
@@ -24,6 +23,7 @@
import org.jboss.tools.flow.jpdl4.model.Parameter;
import org.jboss.tools.flow.jpdl4.model.PrimitiveObject;
import org.jboss.tools.flow.jpdl4.model.Process;
+import org.jboss.tools.flow.jpdl4.model.QueryTask;
import org.jboss.tools.flow.jpdl4.model.ScriptTask;
import org.jboss.tools.flow.jpdl4.model.SequenceFlow;
import org.jboss.tools.flow.jpdl4.model.ServiceTask;
@@ -148,8 +148,8 @@
return new JavaTaskDeserializer();
} else if (element instanceof ScriptTask) {
return new ScriptTaskDeserializer();
- } else if (element instanceof HqlTask) {
- return new HqlTaskDeserializer();
+ } else if (element instanceof QueryTask) {
+ return new QueryTaskDeserializer();
} else {
return new NodeDeserializer();
}
@@ -187,8 +187,8 @@
return new ProcessNodeSerializer();
} else if (element instanceof WaitTask) {
return new ProcessNodeSerializer();
- } else if (element instanceof HqlTask) {
- return new HqlTaskSerializer();
+ } else if (element instanceof QueryTask) {
+ return new QueryTaskSerializer();
} else if (element instanceof SqlTask) {
return new ProcessNodeSerializer();
} else if (element instanceof JavaTask) {
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/HqlTask.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/HqlTask.java 2009-07-05 16:02:25 UTC (rev 16385)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/HqlTask.java 2009-07-05 16:37:05 UTC (rev 16386)
@@ -1,80 +1,7 @@
package org.jboss.tools.flow.jpdl4.model;
-import java.util.ArrayList;
-import java.util.List;
-import org.eclipse.ui.views.properties.IPropertyDescriptor;
-import org.eclipse.ui.views.properties.IPropertySource;
-
-public class HqlTask extends Task {
+public class HqlTask extends QueryTask {
- public static final String VAR = "org.jboss.tools.flow.jpdl4.model.hqlTask.var";
- public static final String UNIQUE = "org.jboss.tools.flow.jpdl4.model.hqlTask.unique";
- public static final String QUERY = "org.jboss.tools.flow.jpdl4.model.hqlTask.query";
- public static final String PARAMETERS = "org.jboss.tools.flow.jpdl4.model.hqlTask.parameters";
-
- private String variableName;
- private String unique;
- private String query;
- private List<PrimitiveObject> parameters = new ArrayList<PrimitiveObject>();
-
- public HqlTask() {
- setMetaData("propertySource", new PropertySource());
- }
-
- protected boolean isPropagationExclusive() {
- return true;
- }
-
- private class PropertySource implements IPropertySource {
-
- public Object getEditableValue() {
- return null;
- }
-
- public IPropertyDescriptor[] getPropertyDescriptors() {
- return new IPropertyDescriptor[0];
- }
-
- public Object getPropertyValue(Object id) {
- if (VAR.equals(id)) {
- return variableName;
- } else if (UNIQUE.equals(id)) {
- return unique;
- } else if (QUERY.equals(id)) {
- return query;
- } else if (PARAMETERS.equals(id)) {
- return parameters;
- }
- return null;
- }
-
- public boolean isPropertySet(Object id) {
- if (VAR.equals(id)) {
- return variableName != null;
- } else if (UNIQUE.equals(id)) {
- return unique != null;
- } else if (QUERY.equals(id)) {
- return query != null;
- } else if (PARAMETERS.equals(id)) {
- return true;
- }
- return false;
- }
-
- public void resetPropertyValue(Object id) {
- }
-
- public void setPropertyValue(Object id, Object value) {
- if (VAR.equals(id)) {
- variableName = (String)value;
- } else if (UNIQUE.equals(id)) {
- unique = (String)value;
- } else if (QUERY.equals(id)) {
- query = (String)value;
- }
- }
-
- }
}
Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/QueryTask.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/QueryTask.java (rev 0)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/QueryTask.java 2009-07-05 16:37:05 UTC (rev 16386)
@@ -0,0 +1,80 @@
+package org.jboss.tools.flow.jpdl4.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.ui.views.properties.IPropertyDescriptor;
+import org.eclipse.ui.views.properties.IPropertySource;
+
+
+public class QueryTask extends Task {
+
+ public static final String VAR = "org.jboss.tools.flow.jpdl4.model.queryTask.var";
+ public static final String UNIQUE = "org.jboss.tools.flow.jpdl4.model.queryTask.unique";
+ public static final String QUERY = "org.jboss.tools.flow.jpdl4.model.queryTask.query";
+ public static final String PARAMETERS = "org.jboss.tools.flow.jpdl4.model.queryTask.parameters";
+
+ private String variableName;
+ private String unique;
+ private String query;
+ private List<PrimitiveObject> parameters = new ArrayList<PrimitiveObject>();
+
+ public QueryTask() {
+ setMetaData("propertySource", new PropertySource());
+ }
+
+ protected boolean isPropagationExclusive() {
+ return true;
+ }
+
+ private class PropertySource implements IPropertySource {
+
+ public Object getEditableValue() {
+ return null;
+ }
+
+ public IPropertyDescriptor[] getPropertyDescriptors() {
+ return new IPropertyDescriptor[0];
+ }
+
+ public Object getPropertyValue(Object id) {
+ if (VAR.equals(id)) {
+ return variableName;
+ } else if (UNIQUE.equals(id)) {
+ return unique;
+ } else if (QUERY.equals(id)) {
+ return query;
+ } else if (PARAMETERS.equals(id)) {
+ return parameters;
+ }
+ return null;
+ }
+
+ public boolean isPropertySet(Object id) {
+ if (VAR.equals(id)) {
+ return variableName != null;
+ } else if (UNIQUE.equals(id)) {
+ return unique != null;
+ } else if (QUERY.equals(id)) {
+ return query != null;
+ } else if (PARAMETERS.equals(id)) {
+ return true;
+ }
+ return false;
+ }
+
+ public void resetPropertyValue(Object id) {
+ }
+
+ public void setPropertyValue(Object id, Object value) {
+ if (VAR.equals(id)) {
+ variableName = (String)value;
+ } else if (UNIQUE.equals(id)) {
+ unique = (String)value;
+ } else if (QUERY.equals(id)) {
+ query = (String)value;
+ }
+ }
+
+ }
+}
Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/QueryTask.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/SqlTask.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/SqlTask.java 2009-07-05 16:02:25 UTC (rev 16385)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/SqlTask.java 2009-07-05 16:37:05 UTC (rev 16386)
@@ -1,10 +1,6 @@
package org.jboss.tools.flow.jpdl4.model;
-public class SqlTask extends Task {
+public class SqlTask extends QueryTask {
- protected boolean isPropagationExclusive() {
- return true;
- }
-
}
Deleted: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/HqlTaskQuerySection.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/HqlTaskQuerySection.java 2009-07-05 16:02:25 UTC (rev 16385)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/HqlTaskQuerySection.java 2009-07-05 16:37:05 UTC (rev 16386)
@@ -1,11 +0,0 @@
-package org.jboss.tools.flow.jpdl4.properties;
-
-import org.jboss.tools.flow.jpdl4.model.HqlTask;
-
-public class HqlTaskQuerySection extends TextFieldPropertySection {
-
- public HqlTaskQuerySection() {
- super(HqlTask.QUERY, "Query");
- }
-
-}
Deleted: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/HqlTaskUniqueSection.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/HqlTaskUniqueSection.java 2009-07-05 16:02:25 UTC (rev 16385)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/HqlTaskUniqueSection.java 2009-07-05 16:37:05 UTC (rev 16386)
@@ -1,11 +0,0 @@
-package org.jboss.tools.flow.jpdl4.properties;
-
-import org.jboss.tools.flow.jpdl4.model.HqlTask;
-
-public class HqlTaskUniqueSection extends TextFieldPropertySection {
-
- public HqlTaskUniqueSection() {
- super(HqlTask.UNIQUE, "Unique");
- }
-
-}
Deleted: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/HqlTaskVariableNameSection.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/HqlTaskVariableNameSection.java 2009-07-05 16:02:25 UTC (rev 16385)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/HqlTaskVariableNameSection.java 2009-07-05 16:37:05 UTC (rev 16386)
@@ -1,11 +0,0 @@
-package org.jboss.tools.flow.jpdl4.properties;
-
-import org.jboss.tools.flow.jpdl4.model.HqlTask;
-
-public class HqlTaskVariableNameSection extends TextFieldPropertySection {
-
- public HqlTaskVariableNameSection() {
- super(HqlTask.VAR, "Variable Name");
- }
-
-}
Copied: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/QueryTaskQuerySection.java (from rev 16344, trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/HqlTaskQuerySection.java)
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/QueryTaskQuerySection.java (rev 0)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/QueryTaskQuerySection.java 2009-07-05 16:37:05 UTC (rev 16386)
@@ -0,0 +1,11 @@
+package org.jboss.tools.flow.jpdl4.properties;
+
+import org.jboss.tools.flow.jpdl4.model.QueryTask;
+
+public class QueryTaskQuerySection extends TextFieldPropertySection {
+
+ public QueryTaskQuerySection() {
+ super(QueryTask.QUERY, "Query");
+ }
+
+}
Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/QueryTaskQuerySection.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/QueryTaskUniqueSection.java (from rev 16344, trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/HqlTaskUniqueSection.java)
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/QueryTaskUniqueSection.java (rev 0)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/QueryTaskUniqueSection.java 2009-07-05 16:37:05 UTC (rev 16386)
@@ -0,0 +1,11 @@
+package org.jboss.tools.flow.jpdl4.properties;
+
+import org.jboss.tools.flow.jpdl4.model.QueryTask;
+
+public class QueryTaskUniqueSection extends TextFieldPropertySection {
+
+ public QueryTaskUniqueSection() {
+ super(QueryTask.UNIQUE, "Unique");
+ }
+
+}
Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/QueryTaskUniqueSection.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/QueryTaskVariableNameSection.java (from rev 16344, trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/HqlTaskVariableNameSection.java)
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/QueryTaskVariableNameSection.java (rev 0)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/QueryTaskVariableNameSection.java 2009-07-05 16:37:05 UTC (rev 16386)
@@ -0,0 +1,11 @@
+package org.jboss.tools.flow.jpdl4.properties;
+
+import org.jboss.tools.flow.jpdl4.model.QueryTask;
+
+public class QueryTaskVariableNameSection extends TextFieldPropertySection {
+
+ public QueryTaskVariableNameSection() {
+ super(QueryTask.VAR, "Variable Name");
+ }
+
+}
Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/QueryTaskVariableNameSection.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/view/DetailsPage.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/view/DetailsPage.java 2009-07-05 16:02:25 UTC (rev 16385)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/view/DetailsPage.java 2009-07-05 16:37:05 UTC (rev 16386)
@@ -18,10 +18,12 @@
private EditPartViewer viewer;
private Control control;
+ private JpdlEditor jpdlEditor;
public DetailsPage(JpdlEditor jpdlEditor) {
viewer = new TreeViewer();
viewer.setEditPartFactory(new JpdlTreeEditPartFactory());
+ this.jpdlEditor = jpdlEditor;
jpdlEditor.getEditDomain().addViewer(viewer);
}
@@ -33,6 +35,10 @@
return viewer;
}
+ public JpdlEditor getContributingEditor() {
+ return jpdlEditor;
+ }
+
public void addSelectionChangedListener(ISelectionChangedListener listener) {
getViewer().addSelectionChangedListener(listener);
}
@@ -76,4 +82,6 @@
}
}
}
+
+
}
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/view/DetailsView.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/view/DetailsView.java 2009-07-05 16:02:25 UTC (rev 16385)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/view/DetailsView.java 2009-07-05 16:37:05 UTC (rev 16386)
@@ -116,8 +116,8 @@
@SuppressWarnings("unchecked")
public Object getAdapter(Class adapter) {
- if (adapter == IPropertySheetPage.class && getCurrentContributingPart() != null)
- return getCurrentContributingPart().getAdapter(adapter);
+ if (adapter == IPropertySheetPage.class && getCurrentPage() != null && getCurrentPage() instanceof DetailsPage)
+ return ((DetailsPage)getCurrentPage()).getContributingEditor().getAdapter(adapter);
return super.getAdapter(adapter);
}
14 years, 10 months
- 1
- 0
JBoss Tools SVN: r16385 - trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2009-07-05 12:02:25 -0400 (Sun, 05 Jul 2009)
New Revision: 16385
Modified:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/AbstractElementDeserializer.java
Log:
remove import
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/AbstractElementDeserializer.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/AbstractElementDeserializer.java 2009-07-05 15:56:27 UTC (rev 16384)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/AbstractElementDeserializer.java 2009-07-05 16:02:25 UTC (rev 16385)
@@ -1,7 +1,6 @@
package org.jboss.tools.flow.jpdl4.io;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
import org.jboss.tools.flow.common.wrapper.Wrapper;
14 years, 10 months
- 1
- 0
JBoss Tools SVN: r16384 - trunk/jbpm/plugins/org.jbpm.gd.jpdl.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2009-07-05 11:56:27 -0400 (Sun, 05 Jul 2009)
New Revision: 16384
Modified:
trunk/jbpm/plugins/org.jbpm.gd.jpdl/plugin.xml
Log:
reorganizing wizards
Modified: trunk/jbpm/plugins/org.jbpm.gd.jpdl/plugin.xml
===================================================================
--- trunk/jbpm/plugins/org.jbpm.gd.jpdl/plugin.xml 2009-07-05 15:40:27 UTC (rev 16383)
+++ trunk/jbpm/plugins/org.jbpm.gd.jpdl/plugin.xml 2009-07-05 15:56:27 UTC (rev 16384)
@@ -307,32 +307,28 @@
<extension
point="org.eclipse.ui.newWizards">
- <category
- name="JBoss jBPM"
- id="org.jbpm.ui">
- </category>
<wizard
- name="Process Definition"
+ name="jBPM 3 Process Definition"
icon="icons/full/obj16/process_definition_enabled.gif"
- category="org.jbpm.ui"
+ category="org.jboss.tools.jbpm"
class="org.jbpm.gd.jpdl.wizard.NewProcessDefinitionWizard"
id="org.jbpm.gd.jpdl.wizard.new.file">
<description>
- A wizard that creates a process diagram
+ A wizard that creates a jBPM 3 process diagram
</description>
<selection
class="org.eclipse.core.resources.IResource">
</selection>
</wizard>
<wizard
- name="Process Project"
+ name="jBPM 3 Project"
icon="icons/full/obj16/process_definition_enabled.gif"
- category="org.jbpm.ui"
+ category="org.jboss.tools.jbpm"
class="org.jbpm.gd.jpdl.wizard.NewProcessProjectWizard"
id="org.jbpm.gd.jpdl.wizard.new.project"
project="true" >
<description>
- A wizard that creates a new jBPM Project
+ A wizard that creates a new jBPM 3 Project
</description>
<selection
class="org.eclipse.core.resources.IResource">
@@ -1228,14 +1224,11 @@
point="org.eclipse.ui.views">
<view
allowMultiple="false"
- category="org.jbpm.gd.jpdl.views"
+ category="org.jboss.tools.jbpm"
class="org.jbpm.gd.common.editor.BirdsEyeViewer"
icon="icons/full/obj16/overview.gif"
id="org.jbpm.gd.jpdl.overview"
- name="Overview"/>
- <category
- id="org.jbpm.gd.jpdl.views"
- name="JBoss jBPM"/>
+ name="Overview (jBPM 3)"/>
</extension>
<extension-point id="assignmentType" name="Assignment Type Extensions" schema="schema/assignmentType.exsd"/>
14 years, 10 months
- 1
- 0
JBoss Tools SVN: r16383 - in trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4: src/org/jboss/tools/flow/jpdl4/editpart and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2009-07-05 11:40:27 -0400 (Sun, 05 Jul 2009)
New Revision: 16383
Added:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/PrimitiveObjectTreeEditPart.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/HqlTaskDeserializer.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/HqlTaskSerializer.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/PrimitiveObjectSerializer.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/PrimitiveObjectValueSection.java
Removed:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/WireObjectTreeEditPart.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/WireObject.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/WireObjectContainer.java
Modified:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/JpdlTreeEditPartFactory.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/AbstractElementDeserializer.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/AbstractElementSerializer.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/Registry.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/SwimlaneSerializer.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/HqlTask.java
Log:
Hql node: query and parameters are supported
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml 2009-07-04 00:43:15 UTC (rev 16382)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml 2009-07-05 15:40:27 UTC (rev 16383)
@@ -306,17 +306,15 @@
</extension>
<extension
point="org.eclipse.ui.newWizards">
- <category
- id="org.jboss.tools.flow.jpdl4"
- name="jBPM 4"
- parentCategory="org.jboss.tools.jbpm">
- </category>
<wizard
- category="org.jboss.tools.flow.jpdl4"
+ category="org.jboss.tools.jbpm"
class="org.jboss.tools.flow.jpdl4.wizard.NewJpdl4FileWizard"
icon="icons/process.gif"
id="org.jboss.tools.flow.jpdl4.file"
- name="Process Definition">
+ name="jBPM 4 Process Definition">
+ <description>
+ A wizard that creates a new jBPM 4 process definition
+ </description>
</wizard>
</extension>
@@ -643,15 +641,22 @@
tab="org.jboss.tools.jpdl4.general">
<input type="org.jboss.tools.flow.jpdl4.model.HqlTask"/>
</propertySection>
+ <propertySection
+ class="org.jboss.tools.flow.jpdl4.properties.PrimitiveObjectValueSection"
+ id="org.jboss.tools.jpdl4.primitiveObject.value"
+ tab="org.jboss.tools.jpdl4.general">
+ <input type="org.jboss.tools.flow.jpdl4.model.PrimitiveObject"/>
+ </propertySection>
</propertySections>
</extension>
<extension
point="org.eclipse.ui.views">
<view
+ category="org.jboss.tools.jbpm"
class="org.jboss.tools.flow.jpdl4.view.DetailsView"
icon="icons/process.gif"
id="org.jboss.tools.flow.jpdl4.details"
- name="Details"
+ name="Details (jBPM 4)"
restorable="true">
</view>
</extension>
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/JpdlTreeEditPartFactory.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/JpdlTreeEditPartFactory.java 2009-07-04 00:43:15 UTC (rev 16382)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/JpdlTreeEditPartFactory.java 2009-07-05 15:40:27 UTC (rev 16383)
@@ -14,10 +14,10 @@
import org.jboss.tools.flow.jpdl4.model.HqlTask;
import org.jboss.tools.flow.jpdl4.model.JavaTask;
import org.jboss.tools.flow.jpdl4.model.Parameter;
+import org.jboss.tools.flow.jpdl4.model.PrimitiveObject;
import org.jboss.tools.flow.jpdl4.model.SubprocessTask;
import org.jboss.tools.flow.jpdl4.model.Swimlane;
import org.jboss.tools.flow.jpdl4.model.Timer;
-import org.jboss.tools.flow.jpdl4.model.WireObject;
public class JpdlTreeEditPartFactory implements EditPartFactory {
@@ -40,7 +40,7 @@
if (element instanceof EventListenerContainer) return new EventListenerListTreeEditPart((Wrapper)model);
if (element instanceof EventListener) return new EventListenerTreeEditPart((Wrapper)model);
if (element instanceof Timer) return new TimerTreeEditPart((Wrapper)model);
- if (element instanceof WireObject) return new WireObjectTreeEditPart((Wrapper)model);
+ if (element instanceof PrimitiveObject) return new PrimitiveObjectTreeEditPart((Wrapper)model);
return new NoDetailsTreeRootEditPart();
}
if (model instanceof SwimlaneListTreeEditPart) return (EditPart)model;
Copied: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/PrimitiveObjectTreeEditPart.java (from rev 16344, trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/WireObjectTreeEditPart.java)
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/PrimitiveObjectTreeEditPart.java (rev 0)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/PrimitiveObjectTreeEditPart.java 2009-07-05 15:40:27 UTC (rev 16383)
@@ -0,0 +1,44 @@
+package org.jboss.tools.flow.jpdl4.editpart;
+
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.swt.graphics.Image;
+import org.jboss.tools.flow.common.wrapper.ModelEvent;
+import org.jboss.tools.flow.common.wrapper.Wrapper;
+import org.jboss.tools.flow.jpdl4.model.PrimitiveObject;
+import org.jboss.tools.flow.jpdl4.util.SharedImages;
+
+public class PrimitiveObjectTreeEditPart extends JpdlTreeEditPart implements ElementTreeEditPart {
+
+ public PrimitiveObjectTreeEditPart(Wrapper wrapper) {
+ super(wrapper);
+ }
+
+ protected Image getImage() {
+ String iconPath = "icons/16/argument.gif";
+ ImageDescriptor descriptor = ImageDescriptor.createFromURL(
+ Platform.getBundle("org.jboss.tools.flow.jpdl4").getEntry(iconPath));
+ return SharedImages.INSTANCE.getImage(descriptor);
+ }
+
+ protected String getText() {
+ String value = (String)((Wrapper)getModel()).getPropertyValue(PrimitiveObject.VALUE);
+ return (value != null && !("".equals(value))) ? value.trim() : "object";
+ }
+
+ public void modelChanged(ModelEvent event) {
+ if (event.getChangeType() == Wrapper.CHANGE_PROPERTY) {
+ refreshVisuals();
+ }
+ }
+
+ public void activate() {
+ super.activate();
+ ((Wrapper)getModel()).addListener(this);
+ }
+
+ public void deactivate() {
+ ((Wrapper)getModel()).removeListener(this);
+ super.deactivate();
+ }
+}
Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/PrimitiveObjectTreeEditPart.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/WireObjectTreeEditPart.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/WireObjectTreeEditPart.java 2009-07-04 00:43:15 UTC (rev 16382)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/WireObjectTreeEditPart.java 2009-07-05 15:40:27 UTC (rev 16383)
@@ -1,42 +0,0 @@
-package org.jboss.tools.flow.jpdl4.editpart;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.graphics.Image;
-import org.jboss.tools.flow.common.wrapper.ModelEvent;
-import org.jboss.tools.flow.common.wrapper.Wrapper;
-import org.jboss.tools.flow.jpdl4.util.SharedImages;
-
-public class WireObjectTreeEditPart extends JpdlTreeEditPart implements ElementTreeEditPart {
-
- public WireObjectTreeEditPart(Wrapper wrapper) {
- super(wrapper);
- }
-
- protected Image getImage() {
- String iconPath = "icons/16/argument.gif";
- ImageDescriptor descriptor = ImageDescriptor.createFromURL(
- Platform.getBundle("org.jboss.tools.flow.jpdl4").getEntry(iconPath));
- return SharedImages.INSTANCE.getImage(descriptor);
- }
-
- protected String getText() {
- return "WireObject";
- }
-
- public void modelChanged(ModelEvent event) {
- if (event.getChangeType() == Wrapper.CHANGE_PROPERTY) {
- refreshVisuals();
- }
- }
-
- public void activate() {
- super.activate();
- ((Wrapper)getModel()).addListener(this);
- }
-
- public void deactivate() {
- ((Wrapper)getModel()).removeListener(this);
- super.deactivate();
- }
-}
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/AbstractElementDeserializer.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/AbstractElementDeserializer.java 2009-07-04 00:43:15 UTC (rev 16382)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/AbstractElementDeserializer.java 2009-07-05 15:40:27 UTC (rev 16383)
@@ -1,6 +1,7 @@
package org.jboss.tools.flow.jpdl4.io;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import org.jboss.tools.flow.common.wrapper.Wrapper;
@@ -21,17 +22,22 @@
NodeList nodeList = element.getChildNodes();
ArrayList<Node> unknownNodeList = new ArrayList<Node>();
for (int i = 0; i < nodeList.getLength(); i++) {
- Wrapper childWrapper = deserializeChildNode(wrapper, nodeList.item(i));
- if (childWrapper != null) {
- childWrapper.getElement().setMetaData("leadingNodes", unknownNodeList);
- unknownNodeList = new ArrayList<Node>();
- } else {
- unknownNodeList.add(nodeList.item(i));
- }
+ deserializeChildNode(wrapper, nodeList.item(i), unknownNodeList);
}
wrapper.getElement().setMetaData("trailingNodes", unknownNodeList);
}
+ protected void deserializeChildNode(Wrapper parent, Node node, List<Node> unknownNodeList) {
+ Wrapper childWrapper = deserializeChildNode(parent, node);
+ if (childWrapper != null) {
+ childWrapper.getElement().setMetaData("leadingNodes", new ArrayList<Node>(unknownNodeList));
+ unknownNodeList.clear();
+ } else {
+ unknownNodeList.add(node);
+ }
+
+ }
+
protected List<String> getAttributesToRead() {
return new ArrayList<String>();
}
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/AbstractElementSerializer.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/AbstractElementSerializer.java 2009-07-04 00:43:15 UTC (rev 16382)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/AbstractElementSerializer.java 2009-07-05 15:40:27 UTC (rev 16383)
@@ -68,8 +68,8 @@
}
@SuppressWarnings("unchecked")
- protected void appendLeadingNodes(StringBuffer buffer, Wrapper wrapper, int level) {
- ArrayList<Node> leadingNodeList = (ArrayList<Node>)wrapper.getElement().getMetaData("leadingNodes");
+ protected void appendUnknownNodes(String type, StringBuffer buffer, Wrapper wrapper, int level) {
+ ArrayList<Node> leadingNodeList = (ArrayList<Node>)wrapper.getElement().getMetaData(type);
boolean appendLeadingNodes = leadingNodeList != null && !leadingNodeList.isEmpty();
if (appendLeadingNodes) {
appendNodeList(buffer, leadingNodeList);
@@ -136,7 +136,7 @@
}
protected void appendOpening(StringBuffer buffer, Wrapper wrapper, int level) {
- appendLeadingNodes(buffer, wrapper, level);
+ appendUnknownNodes("leadingNodes", buffer, wrapper, level);
buffer.append("<" + Registry.getXmlNodeName(wrapper.getElement()));
appendAttributes(buffer, wrapper, level);
}
Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/HqlTaskDeserializer.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/HqlTaskDeserializer.java (rev 0)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/HqlTaskDeserializer.java 2009-07-05 15:40:27 UTC (rev 16383)
@@ -0,0 +1,67 @@
+/**
+ *
+ */
+package org.jboss.tools.flow.jpdl4.io;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.jboss.tools.flow.common.wrapper.Wrapper;
+import org.jboss.tools.flow.jpdl4.model.HqlTask;
+import org.jboss.tools.flow.jpdl4.model.PrimitiveObject;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+class HqlTaskDeserializer extends NodeDeserializer {
+
+ public void deserializeAttributes(Wrapper wrapper, Element element) {
+ super.deserializeAttributes(wrapper, element);
+ wrapper.setPropertyValue(HqlTask.VAR, element.getAttribute("var"));
+ wrapper.setPropertyValue(HqlTask.UNIQUE, element.getAttribute("unique"));
+ }
+
+ public void deserializeChildNodes(Wrapper wrapper,
+ Element element) {
+ if (wrapper == null) return;
+ NodeList nodeList = element.getChildNodes();
+ ArrayList<Node> unknownNodeList = new ArrayList<Node>();
+ for (int i = 0; i < nodeList.getLength(); i++) {
+ Node node = nodeList.item(i);
+ if ("query".equals(node.getNodeName())) {
+ deserializeQuery(wrapper, node, unknownNodeList);
+ } else if ("parameters".equals(node.getNodeName())) {
+ deserializeParameters(wrapper, node, unknownNodeList);
+ } else {
+ deserializeChildNode(wrapper, node, unknownNodeList);
+ }
+ }
+ wrapper.getElement().setMetaData("trailingNodes", unknownNodeList);
+ }
+
+ private void deserializeQuery(Wrapper parent, Node node, List<Node> unknownNodeList) {
+ parent.setMetaData("beforeQueryNodes", new ArrayList<Node>(unknownNodeList));
+ unknownNodeList.clear();
+ // the query has only one child node
+ Node content = node.getChildNodes().item(0);
+ parent.setPropertyValue(HqlTask.QUERY, content.getNodeValue());
+ }
+
+ private void deserializeParameters(Wrapper parent, Node node, List<Node> unknownNodeList) {
+ parent.setMetaData("beforeParametersNodes", new ArrayList<Node>(unknownNodeList));
+ unknownNodeList.clear();
+ // the actual parameters are the children of the <parameters> element
+ NodeList nodeList = node.getChildNodes();
+ for (int i = 0; i < nodeList.getLength(); i++) {
+ Wrapper childWrapper = deserializeChildNode(parent, nodeList.item(i));
+ if (childWrapper != null && childWrapper.getElement() instanceof PrimitiveObject) {
+ parent.addChild(HqlTask.PARAMETERS, childWrapper);
+ childWrapper.getElement().setMetaData("leadingNodes", new ArrayList<Node>(unknownNodeList));
+ unknownNodeList.clear();
+ } else {
+ unknownNodeList.add(node);
+ }
+ }
+ }
+
+}
\ No newline at end of file
Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/HqlTaskDeserializer.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/HqlTaskSerializer.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/HqlTaskSerializer.java (rev 0)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/HqlTaskSerializer.java 2009-07-05 15:40:27 UTC (rev 16383)
@@ -0,0 +1,55 @@
+/**
+ *
+ */
+package org.jboss.tools.flow.jpdl4.io;
+
+import java.util.List;
+
+import org.jboss.tools.flow.common.model.Element;
+import org.jboss.tools.flow.common.wrapper.Wrapper;
+import org.jboss.tools.flow.jpdl4.model.HqlTask;
+
+class HqlTaskSerializer extends ProcessNodeSerializer {
+
+ protected List<String> getAttributesToSave() {
+ List<String> result = super.getAttributesToSave();
+ result.add("var");
+ result.add("unique");
+ return result;
+ }
+
+ protected String getPropertyName(String attributeName) {
+ if ("var".equals(attributeName)) {
+ return HqlTask.VAR;
+ } else if ("unique".equals(attributeName)) {
+ return HqlTask.UNIQUE;
+ }
+ return super.getPropertyName(attributeName);
+ }
+
+ public void appendBody(StringBuffer buffer, Wrapper wrapper, int level) {
+ String query = (String)wrapper.getPropertyValue(HqlTask.QUERY);
+ if (query != null && !"".equals(query)) {
+ appendQuery(buffer, wrapper, query, level+1);
+ }
+ List<Element> parameters =wrapper.getChildren(HqlTask.PARAMETERS);
+ if (parameters != null) {
+ appendParameters(buffer, wrapper, parameters, level+1);
+ }
+ super.appendBody(buffer, wrapper, level);
+ }
+
+ private void appendQuery(StringBuffer buffer, Wrapper wrapper, String query, int level) {
+ appendUnknownNodes("beforeQueryNodes", buffer, wrapper, level);
+ buffer.append("<query>").append(query).append("</query>");
+ }
+
+ private void appendParameters(StringBuffer buffer, Wrapper wrapper, List<Element> parameters, int level) {
+ appendUnknownNodes("beforeParametersNodes", buffer, wrapper, level);
+ for (Element parameter : parameters) {
+ if (parameter instanceof Wrapper) {
+ JpdlSerializer.serialize((Wrapper)parameter, buffer, level+1);
+ }
+ }
+ }
+}
\ No newline at end of file
Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/HqlTaskSerializer.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/PrimitiveObjectSerializer.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/PrimitiveObjectSerializer.java (rev 0)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/PrimitiveObjectSerializer.java 2009-07-05 15:40:27 UTC (rev 16383)
@@ -0,0 +1,19 @@
+/**
+ *
+ */
+package org.jboss.tools.flow.jpdl4.io;
+
+import org.jboss.tools.flow.common.wrapper.Wrapper;
+import org.jboss.tools.flow.jpdl4.model.Argument;
+
+class PrimitiveObjectSerializer extends AbstractElementSerializer {
+
+ public void appendToBuffer(StringBuffer buffer, Wrapper wrapper, int level) {
+ appendUnknownNodes("leadingNodes", buffer, wrapper, level);
+ String value = (String)wrapper.getPropertyValue(Argument.VALUE);
+ if (value != null && !("".equals(value))) {
+ buffer.append(value);
+ }
+ }
+
+}
\ No newline at end of file
Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/PrimitiveObjectSerializer.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/Registry.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/Registry.java 2009-07-04 00:43:15 UTC (rev 16382)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/Registry.java 2009-07-05 15:40:27 UTC (rev 16383)
@@ -148,6 +148,8 @@
return new JavaTaskDeserializer();
} else if (element instanceof ScriptTask) {
return new ScriptTaskDeserializer();
+ } else if (element instanceof HqlTask) {
+ return new HqlTaskDeserializer();
} else {
return new NodeDeserializer();
}
@@ -186,7 +188,7 @@
} else if (element instanceof WaitTask) {
return new ProcessNodeSerializer();
} else if (element instanceof HqlTask) {
- return new ProcessNodeSerializer();
+ return new HqlTaskSerializer();
} else if (element instanceof SqlTask) {
return new ProcessNodeSerializer();
} else if (element instanceof JavaTask) {
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/SwimlaneSerializer.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/SwimlaneSerializer.java 2009-07-04 00:43:15 UTC (rev 16382)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/SwimlaneSerializer.java 2009-07-05 15:40:27 UTC (rev 16383)
@@ -50,7 +50,7 @@
}
}
public void appendOpening(StringBuffer buffer, Wrapper wrapper, int level) {
- appendLeadingNodes(buffer, wrapper, level);
+ appendUnknownNodes("leadingNodes", buffer, wrapper, level);
buffer.append("<swimlane");
appendAttributes(buffer, wrapper, level);
}
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/HqlTask.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/HqlTask.java 2009-07-04 00:43:15 UTC (rev 16382)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/HqlTask.java 2009-07-05 15:40:27 UTC (rev 16383)
@@ -17,7 +17,7 @@
private String variableName;
private String unique;
private String query;
- private List<WireObject> parameters = new ArrayList<WireObject>();
+ private List<PrimitiveObject> parameters = new ArrayList<PrimitiveObject>();
public HqlTask() {
setMetaData("propertySource", new PropertySource());
Deleted: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/WireObject.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/WireObject.java 2009-07-04 00:43:15 UTC (rev 16382)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/WireObject.java 2009-07-05 15:40:27 UTC (rev 16383)
@@ -1,7 +0,0 @@
-package org.jboss.tools.flow.jpdl4.model;
-
-import org.jboss.tools.flow.common.model.DefaultElement;
-
-public class WireObject extends DefaultElement {
-
-}
Deleted: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/WireObjectContainer.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/WireObjectContainer.java 2009-07-04 00:43:15 UTC (rev 16382)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/WireObjectContainer.java 2009-07-05 15:40:27 UTC (rev 16383)
@@ -1,7 +0,0 @@
-package org.jboss.tools.flow.jpdl4.model;
-
-import org.jboss.tools.flow.common.model.DefaultElement;
-
-public class WireObjectContainer extends DefaultElement {
-
-}
Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/PrimitiveObjectValueSection.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/PrimitiveObjectValueSection.java (rev 0)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/PrimitiveObjectValueSection.java 2009-07-05 15:40:27 UTC (rev 16383)
@@ -0,0 +1,11 @@
+package org.jboss.tools.flow.jpdl4.properties;
+
+import org.jboss.tools.flow.jpdl4.model.PrimitiveObject;
+
+public class PrimitiveObjectValueSection extends TextFieldPropertySection {
+
+ public PrimitiveObjectValueSection() {
+ super(PrimitiveObject.VALUE, "Value");
+ }
+
+}
Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/PrimitiveObjectValueSection.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
14 years, 10 months
- 1
- 0
JBoss Tools SVN: r16382 - in trunk/common/plugins/org.jboss.tools.common.verification.ui: META-INF and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2009-07-03 20:43:15 -0400 (Fri, 03 Jul 2009)
New Revision: 16382
Added:
trunk/common/plugins/org.jboss.tools.common.verification.ui/src/org/jboss/tools/common/verification/ui/actions/
trunk/common/plugins/org.jboss.tools.common.verification.ui/src/org/jboss/tools/common/verification/ui/actions/ExcludeResourceHandler.java
trunk/common/plugins/org.jboss.tools.common.verification.ui/src/org/jboss/tools/common/verification/ui/actions/IncludeResourceHandler.java
trunk/common/plugins/org.jboss.tools.common.verification.ui/src/org/jboss/tools/common/verification/ui/actions/ResourceExcludedExpressionFactoryTester.java
Modified:
trunk/common/plugins/org.jboss.tools.common.verification.ui/META-INF/MANIFEST.MF
trunk/common/plugins/org.jboss.tools.common.verification.ui/plugin.properties
trunk/common/plugins/org.jboss.tools.common.verification.ui/plugin.xml
trunk/common/plugins/org.jboss.tools.common.verification.ui/src/org/jboss/tools/common/verification/ui/Messages.java
trunk/common/plugins/org.jboss.tools.common.verification.ui/src/org/jboss/tools/common/verification/ui/XStudioVerificationPlugin.java
trunk/common/plugins/org.jboss.tools.common.verification.ui/src/org/jboss/tools/common/verification/ui/messages.properties
Log:
https://jira.jboss.org/jira/browse/JBIDE-4487 Turn off validation by a per folder basis
Modified: trunk/common/plugins/org.jboss.tools.common.verification.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.verification.ui/META-INF/MANIFEST.MF 2009-07-03 20:55:55 UTC (rev 16381)
+++ trunk/common/plugins/org.jboss.tools.common.verification.ui/META-INF/MANIFEST.MF 2009-07-04 00:43:15 UTC (rev 16382)
@@ -23,6 +23,11 @@
org.eclipse.ui.workbench,
org.eclipse.jdt.ui,
org.jboss.tools.common.verification,
- org.jboss.tools.common.model.ui
+ org.jboss.tools.common.model.ui,
+ org.eclipse.core.expressions,
+ org.eclipse.core.commands,
+ org.eclipse.jface,
+ org.eclipse.wst.common.project.facet.core,
+ org.eclipse.wst.validation
Bundle-Version: 2.0.0
Modified: trunk/common/plugins/org.jboss.tools.common.verification.ui/plugin.properties
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.verification.ui/plugin.properties 2009-07-03 20:55:55 UTC (rev 16381)
+++ trunk/common/plugins/org.jboss.tools.common.verification.ui/plugin.properties 2009-07-04 00:43:15 UTC (rev 16382)
@@ -8,3 +8,8 @@
actionSets.verificationActions.verifyAll.label=Verify All
actionSets.verificationActions.verify.label=Verify
PreferencePage_Verification=Verification
+
+command.name.ExcludeValidation = Exclude Validation
+command.name.IncludeValidation = Include Validation
+command.label.ExcludeValidation = Exclude Validation
+command.label.IncludeValidation = Include Validation
\ No newline at end of file
Modified: trunk/common/plugins/org.jboss.tools.common.verification.ui/plugin.xml
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.verification.ui/plugin.xml 2009-07-03 20:55:55 UTC (rev 16381)
+++ trunk/common/plugins/org.jboss.tools.common.verification.ui/plugin.xml 2009-07-04 00:43:15 UTC (rev 16382)
@@ -47,4 +47,57 @@
<xclass id="org.jboss.tools.common.verification.ui.vrules.wizard.config.VRulesConfigurationWizard"
class="org.jboss.tools.common.verification.ui.vrules.wizard.config.VRulesConfigurationWizard"/>
</extension>
+
+ <extension point="org.eclipse.ui.commands">
+ <command
+ name="%command.name.ExcludeValidation"
+ id="org.jboss.tools.common.verification.ui.actions.ExcludeValidationCommand"
+ defaultHandler="org.jboss.tools.common.verification.ui.actions.ExcludeResourceHandler"/>
+ </extension>
+ <extension point="org.eclipse.ui.commands">
+ <command
+ name="%command.name.IncludeValidation"
+ id="org.jboss.tools.common.verification.ui.actions.IncludeValidationCommand"
+ defaultHandler="org.jboss.tools.common.verification.ui.actions.IncludeResourceHandler"/>
+ </extension>
+ <extension point="org.eclipse.core.expressions.propertyTesters">
+ <propertyTester
+ namespace="org.jboss.tools.verification.ui"
+ properties="resourceExcluded,resourceIncluded"
+ type="org.eclipse.core.runtime.IAdaptable"
+ class="org.jboss.tools.common.verification.ui.actions.ResourceExcludedExpressionFactoryTester"
+ id="org.jboss.tools.common.verification.ui.actions.ResourceExcludedExpressionFactoryTester">
+ </propertyTester>
+ </extension>
+ <extension point="org.eclipse.ui.menus">
+ <menuContribution
+ locationURI="popup:org.eclipse.ui.popup.any?after=additions">
+ <command
+ commandId="org.jboss.tools.common.verification.ui.actions.ExcludeValidationCommand"
+ label="%command.label.ExcludeValidation">
+ <visibleWhen>
+ <with variable="selection">
+ <count value="1"/>
+ <iterate>
+ <instanceof value="org.eclipse.core.runtime.IAdaptable"/>
+ <test property="org.jboss.tools.verification.ui.resourceIncluded" value="true" forcePluginActivation="true"/>
+ </iterate>
+ </with>
+ </visibleWhen>
+ </command>
+ <command
+ commandId="org.jboss.tools.common.verification.ui.actions.IncludeValidationCommand"
+ label="%command.label.IncludeValidation">
+ <visibleWhen>
+ <with variable="selection">
+ <count value="1"/>
+ <iterate>
+ <instanceof value="org.eclipse.core.runtime.IAdaptable"/>
+ <test property="org.jboss.tools.verification.ui.resourceExcluded" value="true" forcePluginActivation="true"/>
+ </iterate>
+ </with>
+ </visibleWhen>
+ </command>
+ </menuContribution>
+ </extension>
</plugin>
\ No newline at end of file
Modified: trunk/common/plugins/org.jboss.tools.common.verification.ui/src/org/jboss/tools/common/verification/ui/Messages.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.verification.ui/src/org/jboss/tools/common/verification/ui/Messages.java 2009-07-03 20:55:55 UTC (rev 16381)
+++ trunk/common/plugins/org.jboss.tools.common.verification.ui/src/org/jboss/tools/common/verification/ui/Messages.java 2009-07-04 00:43:15 UTC (rev 16382)
@@ -4,6 +4,10 @@
public class Messages extends NLS {
private static final String BUNDLE_NAME = "org.jboss.tools.common.verification.ui.messages"; //$NON-NLS-1$
+ public static String ExcludeResourceHandler_Are_you_sure_you_want_to_exclude_all_V2_validators;
+ public static String ExcludeResourceHandler_Exclude_validation;
+ public static String IncludeResourceHandler_Are_you_sure_you_want_to_include_all_V2_validators;
+ public static String IncludeResourceHandler_Include_Validation;
public static String SignificanceView_Any;
public static String SignificanceView_GreaterThanN;
public static String SignificanceView_OnlyTen;
Modified: trunk/common/plugins/org.jboss.tools.common.verification.ui/src/org/jboss/tools/common/verification/ui/XStudioVerificationPlugin.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.verification.ui/src/org/jboss/tools/common/verification/ui/XStudioVerificationPlugin.java 2009-07-03 20:55:55 UTC (rev 16381)
+++ trunk/common/plugins/org.jboss.tools.common.verification.ui/src/org/jboss/tools/common/verification/ui/XStudioVerificationPlugin.java 2009-07-04 00:43:15 UTC (rev 16382)
@@ -10,6 +10,7 @@
******************************************************************************/
package org.jboss.tools.common.verification.ui;
+import org.eclipse.core.runtime.QualifiedName;
import org.jboss.tools.common.log.BaseUIPlugin;
import org.jboss.tools.common.log.IPluginLog;
import org.jboss.tools.common.model.plugin.IModelPlugin;
@@ -18,6 +19,10 @@
// The shared instance
private static XStudioVerificationPlugin plugin;
+
+ public final static String PLUGIN_ID = "org.jboss.tools.common.verification.ui"; //$NON-NLS-1$
+
+ public static final QualifiedName RESOURCE_EXCLUDED = new QualifiedName(PLUGIN_ID, "resourceExcluded"); //$NON-NLS-1$
public XStudioVerificationPlugin() {
super();
Added: trunk/common/plugins/org.jboss.tools.common.verification.ui/src/org/jboss/tools/common/verification/ui/actions/ExcludeResourceHandler.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.verification.ui/src/org/jboss/tools/common/verification/ui/actions/ExcludeResourceHandler.java (rev 0)
+++ trunk/common/plugins/org.jboss.tools.common.verification.ui/src/org/jboss/tools/common/verification/ui/actions/ExcludeResourceHandler.java 2009-07-04 00:43:15 UTC (rev 16382)
@@ -0,0 +1,133 @@
+/*************************************************************************************
+ * Copyright (c) 2008-2009 JBoss by Red Hat and others.
+ * All rights reserved. This program and the accompanying materials
+ * are 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:
+ * JBoss by Red Hat - Initial implementation.
+ ************************************************************************************/
+package org.jboss.tools.common.verification.ui.actions;
+
+import java.util.Iterator;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.handlers.HandlerUtil;
+import org.eclipse.wst.validation.MutableProjectSettings;
+import org.eclipse.wst.validation.ValidationFramework;
+import org.eclipse.wst.validation.Validator;
+import org.eclipse.wst.validation.internal.ValManager;
+import org.eclipse.wst.validation.internal.ValPrefManagerProject;
+import org.eclipse.wst.validation.internal.ValidatorMutable;
+import org.eclipse.wst.validation.internal.ValManager.UseProjectPreferences;
+import org.eclipse.wst.validation.internal.model.FilterGroup;
+import org.eclipse.wst.validation.internal.model.FilterRule;
+import org.eclipse.wst.validation.internal.model.ProjectPreferences;
+import org.jboss.tools.common.verification.ui.Messages;
+import org.jboss.tools.common.verification.ui.XStudioVerificationPlugin;
+
+/**
+* @author snjeza
+*
+*/
+public class ExcludeResourceHandler extends AbstractHandler {
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands
+ * .ExecutionEvent)
+ */
+ public Object execute(ExecutionEvent event) throws ExecutionException {
+ ISelection selection = HandlerUtil.getCurrentSelection(event);
+ if (selection instanceof IStructuredSelection) {
+ Iterator iter = ((IStructuredSelection) selection).iterator();
+ while (iter.hasNext()) {
+ Object element = iter.next();
+ if (!(element instanceof IAdaptable)) {
+ continue;
+ }
+ IResource resource = (IResource) ((IAdaptable) element)
+ .getAdapter(IResource.class);
+ if (resource != null) {
+ excludeResource(resource);
+ }
+ }
+ }
+ return null;
+ }
+
+ private void excludeResource(IResource resource) {
+ IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
+ Shell shell = window.getShell();
+ boolean exclude = MessageDialog.openQuestion(shell, Messages.ExcludeResourceHandler_Exclude_validation, NLS.bind(Messages.ExcludeResourceHandler_Are_you_sure_you_want_to_exclude_all_V2_validators,resource.getName()));
+ if (!exclude) {
+ return;
+ }
+ if (resource.getType() == IResource.PROJECT) {
+ ValidationFramework.getDefault().disableValidation(resource);
+ } else {
+ IProject project = resource.getProject();
+ MutableProjectSettings projectSettings = ValidationFramework.getDefault().getProjectSettings(project);
+ projectSettings.setOverride(true);
+ Validator[] validators = ValManager.getDefault().getValidatorsConfiguredForProject(project, UseProjectPreferences.MustUse);
+ ValidatorMutable[] changedValidator = new ValidatorMutable[validators.length];
+ for (int i = 0; i < validators.length; i++) {
+ ValidatorMutable validator = new ValidatorMutable(validators[i]);
+ changedValidator[i] = validator;
+ if (validator.isV2Validator()) {
+ FilterGroup[] groups = validator.getGroups();
+ FilterGroup excludeGroup = null;
+ for (int j = 0; j < groups.length; j++) {
+ if (groups[j].isExclude()) {
+ excludeGroup = groups[j];
+ break;
+ }
+ }
+ if (excludeGroup == null) {
+ excludeGroup = FilterGroup.create(true, new FilterRule[0]);
+ validator.add(excludeGroup);
+ }
+ String pattern = resource.getProjectRelativePath().toString();
+ int type = -1;
+ if (resource.getType() == IResource.FILE) {
+ type = FilterRule.File.FileTypeFile;
+ } else if (resource.getType() == IResource.FOLDER) {
+ type = FilterRule.File.FileTypeFolder;
+ }
+ if (type != -1) {
+ FilterRule rule = FilterRule.createFile(pattern, true, type);
+ FilterGroup newGroup = FilterGroup.addRule(excludeGroup, rule);
+ validator.replaceFilterGroup(excludeGroup, newGroup);
+
+ }
+ }
+ }
+ ValidationFramework.getDefault().applyChanges(projectSettings, true);
+ ProjectPreferences pp = new ProjectPreferences(project, projectSettings.getOverride(), projectSettings.getSuspend(), null);
+ ValPrefManagerProject vpm = new ValPrefManagerProject(project);
+ vpm.savePreferences(pp, changedValidator);
+ }
+ try {
+ resource.setPersistentProperty(XStudioVerificationPlugin.RESOURCE_EXCLUDED, "true"); //$NON-NLS-1$
+ } catch (CoreException ignore) {
+ ignore.printStackTrace();
+ }
+ }
+
+}
Added: trunk/common/plugins/org.jboss.tools.common.verification.ui/src/org/jboss/tools/common/verification/ui/actions/IncludeResourceHandler.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.verification.ui/src/org/jboss/tools/common/verification/ui/actions/IncludeResourceHandler.java (rev 0)
+++ trunk/common/plugins/org.jboss.tools.common.verification.ui/src/org/jboss/tools/common/verification/ui/actions/IncludeResourceHandler.java 2009-07-04 00:43:15 UTC (rev 16382)
@@ -0,0 +1,123 @@
+/*************************************************************************************
+ * Copyright (c) 2008-2009 JBoss by Red Hat and others.
+ * All rights reserved. This program and the accompanying materials
+ * are 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:
+ * JBoss by Red Hat - Initial implementation.
+ ************************************************************************************/
+package org.jboss.tools.common.verification.ui.actions;
+
+import java.util.Iterator;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.handlers.HandlerUtil;
+import org.eclipse.wst.validation.MutableProjectSettings;
+import org.eclipse.wst.validation.ValidationFramework;
+import org.eclipse.wst.validation.Validator;
+import org.eclipse.wst.validation.internal.ExtensionConstants;
+import org.eclipse.wst.validation.internal.ValManager;
+import org.eclipse.wst.validation.internal.ValPrefManagerProject;
+import org.eclipse.wst.validation.internal.ValidatorMutable;
+import org.eclipse.wst.validation.internal.ValManager.UseProjectPreferences;
+import org.eclipse.wst.validation.internal.model.FilterGroup;
+import org.eclipse.wst.validation.internal.model.FilterRule;
+import org.eclipse.wst.validation.internal.model.ProjectPreferences;
+import org.jboss.tools.common.verification.ui.Messages;
+import org.jboss.tools.common.verification.ui.XStudioVerificationPlugin;
+
+/**
+* @author snjeza
+*
+*/
+public class IncludeResourceHandler extends AbstractHandler {
+
+ /* (non-Javadoc)
+ * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
+ */
+ public Object execute(ExecutionEvent event) throws ExecutionException {
+ ISelection selection = HandlerUtil.getCurrentSelection(event);
+ if (selection instanceof IStructuredSelection) {
+ Iterator iter = ((IStructuredSelection)selection).iterator();
+ while (iter.hasNext()) {
+ Object element = iter.next();
+ if ( !(element instanceof IAdaptable)) {
+ continue;
+ }
+ IResource resource = (IResource) ((IAdaptable) element).getAdapter(IResource.class);
+ if (resource != null) {
+ includeResource(resource);
+ }
+ }
+ }
+ return null;
+ }
+
+ private void includeResource(IResource resource) {
+ IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
+ Shell shell = window.getShell();
+ boolean include = MessageDialog.openQuestion(shell, Messages.IncludeResourceHandler_Include_Validation, NLS.bind(Messages.IncludeResourceHandler_Are_you_sure_you_want_to_include_all_V2_validators,resource.getName()));
+ if (!include) {
+ return;
+ }
+ if (resource.getType() == IResource.PROJECT) {
+ ValidationFramework.getDefault().enableValidation(resource);
+ } else {
+ IProject project = resource.getProject();
+ MutableProjectSettings projectSettings = ValidationFramework.getDefault().getProjectSettings(project);
+ projectSettings.setOverride(true);
+ Validator[] validators = ValManager.getDefault().getValidatorsConfiguredForProject(project, UseProjectPreferences.MustUse);
+ String resourcePattern = resource.getProjectRelativePath().toString();
+ ValidatorMutable[] changedValidator = new ValidatorMutable[validators.length];
+ for (int i = 0; i < validators.length; i++) {
+ ValidatorMutable validator = new ValidatorMutable(validators[i]);
+ changedValidator[i] = validator;
+ if (validator.isV2Validator()) {
+ FilterGroup[] groups = validator.getGroups();
+ for (int j = 0; j < groups.length; j++) {
+ if (groups[j].isExclude()) {
+ FilterGroup group = groups[j];
+ FilterRule[] rules = group.getRules();
+ for (int k = 0; k < rules.length; k++) {
+ FilterRule rule = rules[k];
+ String pattern = rule.getPattern();
+ String type = rule.getType();
+ if (ExtensionConstants.Rule.file.equals(type) && pattern != null && pattern.equals(resourcePattern)) {
+ group.removeRule(group, rule);
+ FilterGroup newGroup = FilterGroup.removeRule(group, rule);
+ validator.replaceFilterGroup(group, newGroup);
+ }
+ }
+ }
+ }
+ }
+ }
+ ValidationFramework.getDefault().applyChanges(projectSettings, true);
+ ValidationFramework.getDefault().applyChanges(projectSettings, true);
+ ProjectPreferences pp = new ProjectPreferences(project, projectSettings.getOverride(), projectSettings.getSuspend(), null);
+ ValPrefManagerProject vpm = new ValPrefManagerProject(project);
+ vpm.savePreferences(pp, changedValidator);
+ }
+ try {
+ resource.setPersistentProperty(XStudioVerificationPlugin.RESOURCE_EXCLUDED, null);
+ } catch (CoreException ignore) {
+ ignore.printStackTrace();
+ }
+ }
+
+}
Added: trunk/common/plugins/org.jboss.tools.common.verification.ui/src/org/jboss/tools/common/verification/ui/actions/ResourceExcludedExpressionFactoryTester.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.verification.ui/src/org/jboss/tools/common/verification/ui/actions/ResourceExcludedExpressionFactoryTester.java (rev 0)
+++ trunk/common/plugins/org.jboss.tools.common.verification.ui/src/org/jboss/tools/common/verification/ui/actions/ResourceExcludedExpressionFactoryTester.java 2009-07-04 00:43:15 UTC (rev 16382)
@@ -0,0 +1,65 @@
+/*************************************************************************************
+ * Copyright (c) 2008-2009 JBoss by Red Hat and others.
+ * All rights reserved. This program and the accompanying materials
+ * are 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:
+ * JBoss by Red Hat - Initial implementation.
+ ************************************************************************************/
+package org.jboss.tools.common.verification.ui.actions;
+
+import org.eclipse.core.expressions.PropertyTester;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.wst.common.project.facet.core.FacetedProjectFramework;
+import org.jboss.tools.common.verification.ui.XStudioVerificationPlugin;
+
+/**
+* @author snjeza
+*
+*/
+public class ResourceExcludedExpressionFactoryTester extends PropertyTester {
+
+ public static final String RESOURCE_EXCLUDED_EXPRESSION_PROPERTY = "resourceExcluded"; //$NON-NLS-1$
+ public static final String RESOURCE_INCLUDED_EXPRESSION_PROPERTY = "resourceIncluded"; //$NON-NLS-1$
+ /* (non-Javadoc)
+ * @see org.eclipse.core.expressions.PropertyTester#test(java.lang.Object, java.lang.String, java.lang.Object[], java.lang.Object)
+ */
+ public boolean test(Object element, String property, Object[] args, Object expectedValue) {
+ if ( !(element instanceof IAdaptable)) {
+ return false;
+ }
+ IResource resource = (IResource) ((IAdaptable) element).getAdapter(IResource.class);
+ if (resource == null) {
+ return false;
+ }
+ if (resource instanceof IProject) {
+ return false;
+ }
+ IProject project = resource.getProject();
+ if (project == null || !project.exists()) {
+ return false;
+ }
+ Object persistentProperty = null;
+ try {
+ if (!FacetedProjectFramework.isFacetedProject(project)) {
+ return false;
+ }
+ persistentProperty = resource.getPersistentProperty(XStudioVerificationPlugin.RESOURCE_EXCLUDED);
+ } catch (CoreException e) {
+ return false;
+ }
+ if (RESOURCE_EXCLUDED_EXPRESSION_PROPERTY.equals(property)){
+ return persistentProperty != null;
+ }
+ if (RESOURCE_INCLUDED_EXPRESSION_PROPERTY.equals(property)){
+ return persistentProperty == null;
+ }
+ return false;
+ }
+}
+
Modified: trunk/common/plugins/org.jboss.tools.common.verification.ui/src/org/jboss/tools/common/verification/ui/messages.properties
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.verification.ui/src/org/jboss/tools/common/verification/ui/messages.properties 2009-07-03 20:55:55 UTC (rev 16381)
+++ trunk/common/plugins/org.jboss.tools.common.verification.ui/src/org/jboss/tools/common/verification/ui/messages.properties 2009-07-04 00:43:15 UTC (rev 16382)
@@ -1,5 +1,9 @@
+ExcludeResourceHandler_Are_you_sure_you_want_to_exclude_all_V2_validators=Are you sure you want to exclude all V2 validators for ''{0}''
+ExcludeResourceHandler_Exclude_validation=Exclude Validation
+IncludeResourceHandler_Are_you_sure_you_want_to_include_all_V2_validators=Are you sure you want to include all V2 validators for ''{0}''
+IncludeResourceHandler_Include_Validation=Include Validation
SignificanceView_Any=any
SignificanceView_GreaterThanN=greater than {0}
SignificanceView_OnlyTen=only 10
-SignificanceView_VerificationLevelLabel=Verification Level:
+SignificanceView_VerificationLevelLabel=Verification Level\:
VerifyWizardView_VerifyTask=Verify {0}
14 years, 10 months
- 1
- 0
JBoss Tools SVN: r16381 - in trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools: tests and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2009-07-03 16:55:55 -0400 (Fri, 03 Jul 2009)
New Revision: 16381
Modified:
trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/JobUtils.java
trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/tests/AbstractResourceMarkerTest.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4545 Fixed
Modified: trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/JobUtils.java
===================================================================
--- trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/JobUtils.java 2009-07-03 20:55:26 UTC (rev 16380)
+++ trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/JobUtils.java 2009-07-03 20:55:55 UTC (rev 16381)
@@ -20,7 +20,7 @@
*/
public class JobUtils {
- private static final long MAX_IDLE = 15*60*1000L;
+ private static final long MAX_IDLE = 20*60*1000L;
private static final long DEFAULT_DELAY = 500;
public static void waitForIdle() {
Modified: trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/tests/AbstractResourceMarkerTest.java
===================================================================
--- trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/tests/AbstractResourceMarkerTest.java 2009-07-03 20:55:26 UTC (rev 16380)
+++ trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/tests/AbstractResourceMarkerTest.java 2009-07-03 20:55:55 UTC (rev 16381)
@@ -55,7 +55,7 @@
IMarker[] markers = resource.findMarkers(type, true, IResource.DEPTH_INFINITE);
for (int i = 0; i < markers.length; i++) {
String message = markers[i].getAttribute(IMarker.MESSAGE, ""); //$NON-NLS-1$
- if (message.matches(pattern)) {
+ if (message.matches(pattern) && markers[i].exists()) {
result.add(markers[i]);
}
}
@@ -115,7 +115,7 @@
int length = markers.length;
for(int i=0;i<markers.length;i++){
// System.out.println("Marker - "+markers[i].getAttribute(IMarker.MESSAGE, "")); //$NON-NLS-1$//$NON-NLS-2$
- if(filter!=null && !filter.accept(markers[i])) {
+ if(markers[i].exists() && (filter==null || filter.accept(markers[i]))) {
length--;
}
}
@@ -137,7 +137,7 @@
// System.out.println("Marker - "+markers[i].getAttribute(IMarker.MESSAGE, "")); //$NON-NLS-1$//$NON-NLS-2$
for(int i=0;i<markers.length;i++){
- if(filter==null || filter.accept(markers[i])) {
+ if(markers[i].exists() && (filter==null || filter.accept(markers[i]))) {
messages.add(markers[i].getAttribute(IMarker.MESSAGE, "")); //$NON-NLS-1$
}
}
@@ -158,7 +158,7 @@
for(int i=0;i<markers.length;i++){
// System.out.println("Marker line number - "+markers[i].getAttribute(IMarker.LINE_NUMBER, 0)); //$NON-NLS-1$
- if(filter==null || filter.accept(markers[i])) {
+ if(markers[i].exists() && (filter==null || filter.accept(markers[i]))) {
numbers.add(markers[i].getAttribute(IMarker.LINE_NUMBER, 0));
}
}
14 years, 10 months
- 1
- 0
JBoss Tools SVN: r16380 - trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2009-07-03 16:55:26 -0400 (Fri, 03 Jul 2009)
New Revision: 16380
Modified:
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4545 Fixed
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java 2009-07-03 20:54:55 UTC (rev 16379)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java 2009-07-03 20:55:26 UTC (rev 16380)
@@ -691,10 +691,6 @@
public void testExpressionLanguageValidator() throws CoreException {
modifyPreferences();
- IPreferenceStore store = SeamCorePlugin.getDefault().getPreferenceStore();
- //System.out.println("UNKNOWN_EL_VARIABLE_PROPERTY_NAME value- "+store.getString(SeamPreferences.UNKNOWN_EL_VARIABLE_PROPERTY_NAME));
- //System.out.println("UNKNOWN_VARIABLE_NAME value- "+store.getString(SeamPreferences.UNKNOWN_VARIABLE_NAME));
- //System.out.println("UNPAIRED_GETTER_OR_SETTER value- "+store.getString(SeamPreferences.UNPAIRED_GETTER_OR_SETTER));
IFile abcComponentXHTMLFile = project.getFile("WebContent/abcComponent.xhtml");
IFile abcComponentFile = project.getFile("src/action/org/domain/SeamWebWarTestProject/session/AbcComponent.java");
@@ -757,7 +753,8 @@
// Unpaired Getter/Setter
//System.out.println("Test - Unpaired Getter/Setter");
-
+ enableUnpairGetterOrSetterValidation(true);
+
IFile abcComponentXHTMLFile4 = project.getFile("WebContent/abcComponent.4");
try{
abcComponentXHTMLFile.setContents(abcComponentXHTMLFile4.getContents(), true, false, null);
@@ -782,7 +779,7 @@
refreshProject(project);
number = getMarkersNumber(abcComponentXHTMLFile);
- assertFalse("Problem marker 'Unpaired Getter/Setter' was not found' not found' not found' not found", number == 0);
+ assertFalse("Problem marker 'Unpaired Getter/Setter' was not found", number == 0);
messages = getMarkersMessage(abcComponentXHTMLFile, SEAM_MARKER_FILTER);
@@ -812,8 +809,22 @@
lineNumbers = getMarkersNumbersOfLine(abcComponentXHTMLFile, SEAM_MARKER_FILTER);
assertEquals("Problem marker has wrong line number", 22, lineNumbers[0].intValue());
+
+ enableUnpairGetterOrSetterValidation(false);
}
-
+
+ private void enableUnpairGetterOrSetterValidation(boolean enamble) {
+ IPreferenceStore store = SeamCorePlugin.getDefault().getPreferenceStore();
+ store.putValue(SeamPreferences.UNPAIRED_GETTER_OR_SETTER, enamble?SeamPreferences.ERROR:SeamPreferences.IGNORE);
+ if(store instanceof IPersistentPreferenceStore) {
+ try {
+ ((IPersistentPreferenceStore)store).save();
+ } catch (IOException e) {
+ SeamCorePlugin.getPluginLog().logError(e);
+ }
+ }
+ }
+
public void testInheritedMethods() {
ISeamProject seamProject = getSeamProject(project);
@@ -874,27 +885,14 @@
int n = getMarkersNumber(xhtmlFile, SEAM_MARKER_FILTER);
assertEquals("There should be an unresolved EL in testElRevalidation.xhtml.", 1, n);
- // We have to change the java file twice to clean all relations between xhtml and java.
SeamCorePlugin.getDefault().getPreferenceStore().setValue(SeamPreferences.RE_VALIDATE_UNRESOLVED_EL, SeamPreferences.DISABLE);
+ // Check if the validator was not invoked.
try {
componentFile.setContents(originalComponentFile.getContents(), true, false, null);
} catch(Exception ex) {
JUnitUtils.fail("Error in changing 'TestElRevalidation.original' content to 'TestElRevalidation.java'", ex);
}
refreshProject(project);
- try {
- componentFile.setContents(newComponentFile.getContents(), true, false, null);
- } catch(Exception ex) {
- JUnitUtils.fail("Error in changing 'TestElRevalidation.new' content to 'TestElRevalidation.java'", ex);
- }
- // then we can check if validator was not invoked.
- refreshProject(project);
- try {
- componentFile.setContents(originalComponentFile.getContents(), true, false, null);
- } catch(Exception ex) {
- JUnitUtils.fail("Error in changing 'TestElRevalidation.original' content to 'TestElRevalidation.java'", ex);
- }
- refreshProject(project);
n = getMarkersNumber(xhtmlFile, SEAM_MARKER_FILTER);
assertEquals("There should be an unresolved EL in testElRevalidation.xhtml.", 1, n);
@@ -916,7 +914,7 @@
store.putValue(SeamPreferences.UNKNOWN_EL_VARIABLE_NAME, SeamPreferences.ERROR);
store.putValue(SeamPreferences.UNKNOWN_EL_VARIABLE_PROPERTY_NAME, SeamPreferences.ERROR);
store.putValue(SeamPreferences.UNKNOWN_VARIABLE_NAME, SeamPreferences.ERROR);
- store.putValue(SeamPreferences.UNPAIRED_GETTER_OR_SETTER, SeamPreferences.ERROR);
+// store.putValue(SeamPreferences.UNPAIRED_GETTER_OR_SETTER, SeamPreferences.ERROR);
if(store instanceof IPersistentPreferenceStore) {
try {
14 years, 10 months
- 1
- 0