JBoss Tools SVN: r14874 - in trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui: internal/project/facet and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2009-04-23 13:17:15 -0400 (Thu, 23 Apr 2009)
New Revision: 14874
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamUIMessages.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/ValidatorFactory.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/RenameComponentWizard.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-1077
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamUIMessages.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamUIMessages.java 2009-04-23 15:02:45 UTC (rev 14873)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamUIMessages.java 2009-04-23 17:17:15 UTC (rev 14874)
@@ -281,6 +281,8 @@
public static String VALIDATOR_FACTORY_LOCAL_INTERFACE_NAME_IS_NOT_VALID;
public static String VALIDATOR_FACTORY_NAME_IS_NOT_VALID;
+
+ public static String VALIDATOR_FACTORY_COMPONENT_ALREADY_EXISTS;
public static String VALIDATOR_FACTORY_PATH_POINTS_TO_FILE;
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/ValidatorFactory.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/ValidatorFactory.java 2009-04-23 15:02:45 UTC (rev 14873)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/ValidatorFactory.java 2009-04-23 17:17:15 UTC (rev 14874)
@@ -35,6 +35,7 @@
import org.eclipse.jdt.internal.corext.util.Messages;
import org.eclipse.jdt.internal.ui.wizards.NewWizardMessages;
import org.eclipse.osgi.util.NLS;
+import org.jboss.tools.seam.core.ISeamComponent;
import org.jboss.tools.seam.core.ISeamProject;
import org.jboss.tools.seam.core.SeamCorePlugin;
import org.jboss.tools.seam.core.project.facet.SeamRuntime;
@@ -246,8 +247,15 @@
public static final IValidator SEAM_COMPONENT_NAME_VALIDATOR = new IValidator() {
public Map<String, IStatus> validate(Object value, Object context) {
- IStatus status = JavaConventions.validateClassFileName(value
- .toString()
+ String name = value.toString();
+ if(context != null && context instanceof ISeamProject){
+ ISeamProject seamProject = (ISeamProject)context;
+ ISeamComponent component = seamProject.getComponent(name);
+ if(component != null)
+ return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.bind(SeamUIMessages.VALIDATOR_FACTORY_COMPONENT_ALREADY_EXISTS, name)));
+ }
+
+ IStatus status = JavaConventions.validateClassFileName(name
+ ".class", "5.0", "5.0"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
if (status.isOK()) {
return NO_ERRORS;
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties 2009-04-23 15:02:45 UTC (rev 14873)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties 2009-04-23 17:17:15 UTC (rev 14874)
@@ -110,6 +110,7 @@
VALIDATOR_FACTORY_JBOSS_AS_HOME_FOLDER_POINT_TO_LOCATION_THAT_DOES_NOT_LOOK_LIKE_JBOSS_AS_HOME_FOLDER=JBoss AS Home Folder field points to location that doesn't look like JBoss AS home folder
VALIDATOR_FACTORY_COMPONENT_NAME_IS_NOT_VALID=Component name is not invalid.
VALIDATOR_FACTORY_NAME_IS_NOT_VALID={0} name is not valid.
+VALIDATOR_FACTORY_COMPONENT_ALREADY_EXISTS=Component {0} already exists.
VALIDATOR_FACTORY_LOCAL_INTERFACE_NAME_IS_NOT_VALID=Local Interface name is not valid.\n
VALIDATOR_FACTORY_NAME_IS_NOT_VALID2=\ name is not valid.
VALIDATOR_FACTORY_PROJECT_DOES_NOT_EXIST=Project ''{0}'' doesn''t exist.
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/RenameComponentWizard.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/RenameComponentWizard.java 2009-04-23 15:02:45 UTC (rev 14873)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/RenameComponentWizard.java 2009-04-23 17:17:15 UTC (rev 14874)
@@ -14,7 +14,9 @@
import java.beans.PropertyChangeListener;
import java.util.Map;
+import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
import org.eclipse.jface.wizard.IWizardPage;
import org.eclipse.ltk.core.refactoring.Refactoring;
import org.eclipse.ltk.core.refactoring.RefactoringStatus;
@@ -26,6 +28,8 @@
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
import org.jboss.tools.seam.core.ISeamComponent;
+import org.jboss.tools.seam.core.ISeamProject;
+import org.jboss.tools.seam.core.SeamCorePlugin;
import org.jboss.tools.seam.internal.core.refactoring.RenameComponentProcessor;
import org.jboss.tools.seam.ui.SeamUIMessages;
import org.jboss.tools.seam.ui.internal.project.facet.IValidator;
@@ -42,10 +46,12 @@
private ISeamComponent component;
private String componentName;
private IFieldEditor editor;
+ private ISeamProject seamProject;
public RenameComponentWizard(Refactoring refactoring, ISeamComponent component) {
super(refactoring, WIZARD_BASED_USER_INTERFACE);
this.component = component;
+ seamProject = SeamCorePlugin.getSeamProject((IProject)component.getResource(), true);
}
/* (non-Javadoc)
@@ -83,10 +89,11 @@
}
});
setControl(container);
+ setPageComplete(false);
}
protected final void validatePage() {
- Map<String, IStatus> errors = ValidatorFactory.SEAM_COMPONENT_NAME_VALIDATOR.validate(editor.getValueAsString(), null);
+ Map<String, IStatus> errors = ValidatorFactory.SEAM_COMPONENT_NAME_VALIDATOR.validate(editor.getValueAsString(), seamProject);
if(errors.size()>0) {
setErrorMessage(NLS.bind(errors.get(IValidator.DEFAULT_ERROR).getMessage(),SeamUIMessages.SEAM_BASE_WIZARD_PAGE_SEAM_COMPONENTS));
setPageComplete(false);
15 years, 8 months
- 1
- 0
JBoss Tools SVN: r14873 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2009-04-23 11:02:45 -0400 (Thu, 23 Apr 2009)
New Revision: 14873
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/RenameComponentProcessor.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-1077
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/RenameComponentProcessor.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/RenameComponentProcessor.java 2009-04-23 14:03:12 UTC (rev 14872)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/RenameComponentProcessor.java 2009-04-23 15:02:45 UTC (rev 14873)
@@ -73,15 +73,13 @@
import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.common.util.FileUtil;
import org.jboss.tools.seam.core.ISeamComponent;
-import org.jboss.tools.seam.core.ISeamContextVariable;
import org.jboss.tools.seam.core.ISeamJavaComponentDeclaration;
-import org.jboss.tools.seam.core.ISeamProject;
import org.jboss.tools.seam.core.ISeamTextSourceReference;
import org.jboss.tools.seam.core.ISeamXmlComponentDeclaration;
import org.jboss.tools.seam.core.SeamCorePlugin;
import org.jboss.tools.seam.core.SeamProjectsSet;
-import org.jboss.tools.seam.internal.core.BijectedAttribute;
import org.jboss.tools.seam.internal.core.SeamComponentDeclaration;
+import org.jboss.tools.seam.internal.core.validation.SeamContextValidationHelper;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -107,7 +105,7 @@
private IFile declarationFile=null;
private ISeamComponent component;
private String newName;
- //private ISeamProject seamProject;
+ SeamContextValidationHelper coreHelper = new SeamContextValidationHelper();
/**
* @param component Renamed component
@@ -336,20 +334,11 @@
private void renameJavaDeclaration(ISeamJavaComponentDeclaration javaDecl) throws CoreException{
declarationFile = (IFile)javaDecl.getResource();
- if(declarationFile != null){
-// ISeamTextSourceReference location = ((SeamComponentDeclaration)javaDecl).getLocationFor(ISeamXmlComponentDeclaration.NAME);
-// if(location != null){
-// TextFileChange change = getChange(declarationFile);
-// TextEdit edit = new ReplaceEdit(location.getStartPosition(), location.getLength(), newName);
-// change.addEdit(edit);
-// }
- IAnnotation annotation = getNameAnnotation(declarationFile);
- if(annotation != null){
+ if(declarationFile != null && !coreHelper.isJar(javaDecl)){
+ ISeamTextSourceReference location = ((SeamComponentDeclaration)javaDecl).getLocationFor(ISeamXmlComponentDeclaration.NAME);
+ if(location != null){
TextFileChange change = getChange(declarationFile);
-
- String annotationText = annotation.getSource().replace(component.getName(), newName);
-
- TextEdit edit = new ReplaceEdit(annotation.getSourceRange().getOffset(), annotation.getSourceRange().getLength(), annotationText);
+ TextEdit edit = new ReplaceEdit(location.getStartPosition(), location.getLength(), "\""+newName+"\"");
change.addEdit(edit);
}
}
@@ -357,12 +346,30 @@
private void renameXMLDeclaration(ISeamXmlComponentDeclaration xmlDecl){
declarationFile = (IFile)xmlDecl.getResource();
- if(declarationFile != null){
+ if(declarationFile != null && !coreHelper.isJar(xmlDecl)){
+ String content = null;
+ try {
+ content = FileUtil.readStream(declarationFile.getContents());
+ } catch (CoreException e) {
+ SeamCorePlugin.getPluginLog().logError(e);
+ return;
+ }
ISeamTextSourceReference location = ((SeamComponentDeclaration)xmlDecl).getLocationFor(ISeamXmlComponentDeclaration.NAME);
if(location != null){
- TextFileChange change = getChange(declarationFile);
- TextEdit edit = new ReplaceEdit(location.getStartPosition(), location.getLength(), newName);
- change.addEdit(edit);
+ String text = content.substring(location.getStartPosition(), location.getStartPosition()+location.getLength());
+ if(text.startsWith("<")){
+ int position = text.lastIndexOf("/>");
+ if(position < 0){
+ position = text.lastIndexOf(">");
+ }
+ TextFileChange change = getChange(declarationFile);
+ TextEdit edit = new ReplaceEdit(location.getStartPosition()+position, 0, " name=\""+newName+"\"");
+ change.addEdit(edit);
+ }else{
+ TextFileChange change = getChange(declarationFile);
+ TextEdit edit = new ReplaceEdit(location.getStartPosition(), location.getLength(), newName);
+ change.addEdit(edit);
+ }
}
}
}
15 years, 8 months
- 1
- 0
JBoss Tools SVN: r14872 - in trunk/hibernatetools: plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect and 6 other directories.
by jbosstools-commits＠lists.jboss.org
Author: vyemialyanchyk
Date: 2009-04-23 10:03:12 -0400 (Thu, 23 Apr 2009)
New Revision: 14872
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/JdtUiMessages.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/JdtUiMessages.properties
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/AllEntitiesInfoCollector.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/CollectEntityInfo.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/common/EntityInfo.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/AllEntitiesProcessor.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/ProcessEntityInfo.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/wizard/EntitiesList.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/wizard/IHibernateJPAWizardParams.java
trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/fields/Country.java
trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/fields/DocumentBase.java
trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/fields/Foto.java
trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/fields/FotoXPerson.java
trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/fields/Passport.java
trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/fields/Person.java
trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/fields/PersonXFoto.java
trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/fields/Staff.java
trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/fields/Visa.java
trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/Country.java
trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/FotoXPerson.java
trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/Passport.java
trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/Person.java
trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/PersonXFoto.java
trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/Staff.java
trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/Visa.java
trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/JPAMapTest.java
Log:
JBIDE-4229
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/JdtUiMessages.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/JdtUiMessages.java 2009-04-23 13:13:04 UTC (rev 14871)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/JdtUiMessages.java 2009-04-23 14:03:12 UTC (rev 14872)
@@ -6,11 +6,11 @@
private static final String BUNDLE_NAME = "org.hibernate.eclipse.jdt.ui.internal.JdtUiMessages"; //$NON-NLS-1$
public static String AllEntitiesProcessor_header;
public static String AllEntitiesProcessor_message;
- public static String AllEntitiesProcessor_setup_annotation_generation_preference;
+ public static String AllEntitiesProcessor_preferred_location_annotations;
public static String AllEntitiesProcessor_enable_optimistic_locking;
public static String AllEntitiesProcessor_default_string_length;
- public static String AllEntitiesProcessor_annotate_fields;
- public static String AllEntitiesProcessor_annotate_getters;
+ public static String AllEntitiesProcessor_fields;
+ public static String AllEntitiesProcessor_getters;
public static String AllEntitiesProcessor_auto_select_from_class_preference;
public static String CriteriaQuickAssistProcessor_copy_to_criteria_editor;
public static String CriteriaQuickAssistProcessor_errormessage;
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/JdtUiMessages.properties
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/JdtUiMessages.properties 2009-04-23 13:13:04 UTC (rev 14871)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/JdtUiMessages.properties 2009-04-23 14:03:12 UTC (rev 14872)
@@ -10,11 +10,11 @@
##############################################################################/
AllEntitiesProcessor_header=Hibernate: add JPA annotations
AllEntitiesProcessor_message=Add JPA annotations to the related set of entities. The following classes will be changed:
-AllEntitiesProcessor_setup_annotation_generation_preference=Setup annotation generation preference:
+AllEntitiesProcessor_preferred_location_annotations=Preferred location of Annotations:
AllEntitiesProcessor_enable_optimistic_locking=Enable optimistic locking:
AllEntitiesProcessor_default_string_length=Default string length (255 by default):
-AllEntitiesProcessor_annotate_fields=Annotate fields
-AllEntitiesProcessor_annotate_getters=Annotate getters
+AllEntitiesProcessor_fields=Fields
+AllEntitiesProcessor_getters=Getters
AllEntitiesProcessor_auto_select_from_class_preference=Auto select from class preference
CriteriaQuickAssistProcessor_copy_to_criteria_editor=Copy to Criteria Editor
CriteriaQuickAssistProcessor_errormessage= Could not get document contents for CriteriaQuickAssist
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/AllEntitiesInfoCollector.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/AllEntitiesInfoCollector.java 2009-04-23 13:13:04 UTC (rev 14871)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/AllEntitiesInfoCollector.java 2009-04-23 14:03:12 UTC (rev 14872)
@@ -321,6 +321,21 @@
}
}
+ public boolean hasMappedSuperclassVersion(String parentName) {
+ if (parentName == null) {
+ return false;
+ }
+ EntityInfo entryInfoParent = mapCUs_Info.get(parentName);
+ if (entryInfoParent == null) {
+ return false;
+ }
+ if (entryInfoParent.isAddMappedSuperclassFlag() ||
+ entryInfoParent.hasMappedSuperclassAnnotation()) {
+ return true;
+ }
+ return false;
+ }
+
/**
* process all entities pairs iteratively:
* firstly process pairs with more information about and
@@ -328,6 +343,24 @@
*/
public void resolveRelations() {
Iterator<Map.Entry<String, EntityInfo>> it = null;
+ // resolve parent/child relations
+ // in the case if a child has a @MappedSuperclass parent with version property
+ // we shouldn't add version property to the child
+ it = mapCUs_Info.entrySet().iterator();
+ while (it.hasNext()) {
+ Map.Entry<String, EntityInfo> entry = it.next();
+ EntityInfo entityInfo = entry.getValue();
+ String parentName = entityInfo.getFullyQualifiedParentName();
+ if (hasMappedSuperclassVersion(parentName)) {
+ entityInfo.setAddVersionFlag(false);
+ }
+ else {
+ entityInfo.setAddVersionFlag(true);
+ }
+ entityInfo.updateVersionImport(entityInfo.isAddVersionFlag());
+ }
+ //
+ // resolve connection relations
int fromVariableCounter = 0;
int fromMethodCounter = 0;
// generate RefFieldInfoMap (for simple process)
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/CollectEntityInfo.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/CollectEntityInfo.java 2009-04-23 13:13:04 UTC (rev 14871)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/CollectEntityInfo.java 2009-04-23 14:03:12 UTC (rev 14872)
@@ -46,6 +46,7 @@
import org.hibernate.eclipse.jdt.ui.internal.jpa.common.JPAConst;
import org.hibernate.eclipse.jdt.ui.internal.jpa.common.RefType;
import org.hibernate.eclipse.jdt.ui.internal.jpa.common.Utils;
+import org.hibernate.eclipse.jdt.ui.internal.jpa.common.EntityInfo.FieldGetterType;
/**
* Visitor to collect information about JPA entity.
@@ -175,6 +176,7 @@
}
entityInfo.setAddEntityFlag(false);
entityInfo.setAddMappedSuperclassFlag(false);
+ entityInfo.setHasMappedSuperclassAnnotation(true);
}
}
else if (JPAConst.isAnnotationVersion(fullyQualifiedName)) {
@@ -184,7 +186,7 @@
if (tb == null) {
entityInfo.addRequiredImport(JPAConst.IMPORT_VERSION);
}
- entityInfo.setAddVersionFlag(false);
+ entityInfo.setHasVersionAnnotation(true);
}
}
else if (JPAConst.isAnnotationColumn(fullyQualifiedName) && node instanceof NormalAnnotation) {
@@ -398,7 +400,7 @@
}
}
// process it as a field declaration
- boolean res = processFieldOrGetter(type, list);
+ boolean res = processFieldOrGetter(type, list, false);
return res;
}
@@ -411,11 +413,28 @@
String name = var.getName().getIdentifier();
list.add(name);
}
- boolean res = processFieldOrGetter(type, list);
+ boolean res = processFieldOrGetter(type, list, true);
return res;
}
+
+ public FieldGetterType updateFieldGetter(FieldGetterType fieldGetter, boolean fieldFlag) {
+ if (fieldGetter == FieldGetterType.FIELD) {
+ if (!fieldFlag) {
+ fieldGetter = FieldGetterType.FIELD_GETTER;
+ }
+ }
+ else if (fieldGetter == FieldGetterType.GETTER) {
+ if (fieldFlag) {
+ fieldGetter = FieldGetterType.FIELD_GETTER;
+ }
+ }
+ else if (fieldGetter == FieldGetterType.UNDEF) {
+ fieldGetter = fieldFlag ? FieldGetterType.FIELD : FieldGetterType.GETTER;
+ }
+ return fieldGetter;
+ }
- public boolean processFieldOrGetter(Type type, List<String> list) {
+ public boolean processFieldOrGetter(Type type, List<String> list, boolean fieldFlag) {
if (type == null) {
return false;
}
@@ -427,7 +446,9 @@
while (itVarNames.hasNext()) {
String name = (String)itVarNames.next();
if ("version".equalsIgnoreCase(name)) { //$NON-NLS-1$
- entityInfo.setAddVersionFlag(true);
+ FieldGetterType versionFieldGetter =
+ updateFieldGetter(entityInfo.getVersionFieldGetter(), fieldFlag);
+ entityInfo.setVersionFieldGetter(versionFieldGetter);
}
else {
entityInfo.addPrimaryIdCandidate(name);
@@ -464,7 +485,9 @@
while (itVarNames.hasNext()) {
String name = (String)itVarNames.next();
if ("version".equalsIgnoreCase(name)) { //$NON-NLS-1$
- entityInfo.setAddVersionFlag(true);
+ FieldGetterType versionFieldGetter =
+ updateFieldGetter(entityInfo.getVersionFieldGetter(), fieldFlag);
+ entityInfo.setVersionFieldGetter(versionFieldGetter);
}
else {
entityInfo.addPrimaryIdCandidate(name);
@@ -477,7 +500,9 @@
while (itVarNames.hasNext()) {
String name = (String)itVarNames.next();
if ("version".equalsIgnoreCase(name)) { //$NON-NLS-1$
- entityInfo.setAddVersionFlag(true);
+ FieldGetterType versionFieldGetter =
+ updateFieldGetter(entityInfo.getVersionFieldGetter(), fieldFlag);
+ entityInfo.setVersionFieldGetter(versionFieldGetter);
}
}
}
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/common/EntityInfo.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/common/EntityInfo.java 2009-04-23 13:13:04 UTC (rev 14871)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/common/EntityInfo.java 2009-04-23 14:03:12 UTC (rev 14872)
@@ -58,6 +58,10 @@
*/
protected boolean addMappedSuperclassFlag = false;
/*
+ * if true - "@MappedSuperclass" exist for the entity
+ */
+ protected boolean hasMappedSuperclassAnnotation = false;
+ /*
* existing imports set
*/
protected Set<String> setExistingImports = new TreeSet<String>();
@@ -95,10 +99,39 @@
*/
protected boolean addGeneratedValueFlag = true;
/*
- * if true - add version marker for "version" property
+ * if true - add version marker for "version" field
*/
protected boolean addVersionFlag = false;
+ //
+ public enum FieldGetterType {
+ UNDEF(0),
+ FIELD(1),
+ GETTER(2),
+ FIELD_GETTER(3);
+
+ FieldGetterType(int id) {
+ this.id = id;
+ }
+
+ private int id;
+
+ public int getId() {
+ return id;
+ }
+
+ public static String getClassName() {
+ return FieldGetterType.class.getName();
+ }
+ }
/*
+ * if true - entity has "version" field
+ */
+ protected FieldGetterType versionFieldGetter = FieldGetterType.UNDEF;
+ /*
+ * if true - there is a property with @Version
+ */
+ protected boolean hasVersionAnnotation = false;
+ /*
* define relations between entities
* field id -> RefEntityInfo
*/
@@ -212,12 +245,7 @@
else {
removeRequiredImport(JPAConst.IMPORT_MAPPEDSUPERCLASS);
}
- if (isAddVersionFlag()) {
- addRequiredImport(JPAConst.IMPORT_VERSION);
- }
- else {
- removeRequiredImport(JPAConst.IMPORT_VERSION);
- }
+ updateVersionImport(FieldGetterType.UNDEF != getVersionFieldGetter());
updateColumnAnnotationImport(false);
Iterator<Map.Entry<String, RefEntityInfo>> referencesIt =
getReferences().entrySet().iterator();
@@ -263,6 +291,15 @@
}
}
+ public void updateVersionImport(boolean includeFlag) {
+ if (includeFlag) {
+ addRequiredImport(JPAConst.IMPORT_VERSION);
+ }
+ else {
+ removeRequiredImport(JPAConst.IMPORT_VERSION);
+ }
+ }
+
public void updateColumnAnnotationImport(boolean nonDefault) {
if (isNonColumnAnnotatedStringField() && nonDefault) {
addRequiredImport(JPAConst.IMPORT_COLUMN);
@@ -336,6 +373,14 @@
this.addMappedSuperclassFlag = addMappedSuperclassFlag;
}
+ public boolean hasMappedSuperclassAnnotation() {
+ return hasMappedSuperclassAnnotation;
+ }
+
+ public void setHasMappedSuperclassAnnotation(boolean hasMappedSuperclassAnnotation) {
+ this.hasMappedSuperclassAnnotation = hasMappedSuperclassAnnotation;
+ }
+
public boolean isAddSerializableInterfaceFlag() {
return addSerializableInterfaceFlag;
}
@@ -512,6 +557,22 @@
this.addVersionFlag = addVersionFlag;
}
+ public FieldGetterType getVersionFieldGetter() {
+ return versionFieldGetter;
+ }
+
+ public void setVersionFieldGetter(FieldGetterType versionFieldGetter) {
+ this.versionFieldGetter = versionFieldGetter;
+ }
+
+ public boolean hasVersionAnnotation() {
+ return hasVersionAnnotation;
+ }
+
+ public void setHasVersionAnnotation(boolean hasVersionAnnotation) {
+ this.hasVersionAnnotation = hasVersionAnnotation;
+ }
+
public void addExistingImport(String existingImport) {
setExistingImports.add(existingImport);
}
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/AllEntitiesProcessor.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/AllEntitiesProcessor.java 2009-04-23 13:13:04 UTC (rev 14871)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/AllEntitiesProcessor.java 2009-04-23 14:03:12 UTC (rev 14872)
@@ -64,10 +64,6 @@
public final static String storePropertyName =
"hibernate.jpa.generation.AnnotationStyle.preference"; //$NON-NLS-1$
/**
- * @Column length - default value
- */
- public final static int columnLength = 255;
- /**
* default length for column which corresponds to String field
*/
protected int defaultStrLength = columnLength;
@@ -281,6 +277,7 @@
//
entityInfo.updateColumnAnnotationImport(defaultStrLength != columnLength);
+ entityInfo.updateVersionImport(enableOptLock && entityInfo.isAddVersionFlag());
//
ChangeStructure cs = new ChangeStructure();
cs.fullyQualifiedName = fullyQualifiedName;
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/ProcessEntityInfo.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/ProcessEntityInfo.java 2009-04-23 13:13:04 UTC (rev 14871)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/ProcessEntityInfo.java 2009-04-23 14:03:12 UTC (rev 14872)
@@ -18,21 +18,28 @@
import org.eclipse.jdt.core.dom.ASTNode;
import org.eclipse.jdt.core.dom.ASTVisitor;
import org.eclipse.jdt.core.dom.ArrayType;
+import org.eclipse.jdt.core.dom.Assignment;
import org.eclipse.jdt.core.dom.Block;
import org.eclipse.jdt.core.dom.BodyDeclaration;
import org.eclipse.jdt.core.dom.CompilationUnit;
+import org.eclipse.jdt.core.dom.ExpressionStatement;
+import org.eclipse.jdt.core.dom.FieldAccess;
import org.eclipse.jdt.core.dom.FieldDeclaration;
import org.eclipse.jdt.core.dom.ImportDeclaration;
import org.eclipse.jdt.core.dom.MarkerAnnotation;
import org.eclipse.jdt.core.dom.MemberValuePair;
import org.eclipse.jdt.core.dom.MethodDeclaration;
import org.eclipse.jdt.core.dom.Modifier;
+import org.eclipse.jdt.core.dom.Name;
import org.eclipse.jdt.core.dom.NormalAnnotation;
import org.eclipse.jdt.core.dom.NumberLiteral;
import org.eclipse.jdt.core.dom.QualifiedName;
+import org.eclipse.jdt.core.dom.ReturnStatement;
import org.eclipse.jdt.core.dom.SimpleName;
import org.eclipse.jdt.core.dom.SimpleType;
+import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
import org.eclipse.jdt.core.dom.StringLiteral;
+import org.eclipse.jdt.core.dom.ThisExpression;
import org.eclipse.jdt.core.dom.Type;
import org.eclipse.jdt.core.dom.TypeDeclaration;
import org.eclipse.jdt.core.dom.VariableDeclarationFragment;
@@ -46,6 +53,7 @@
import org.hibernate.eclipse.jdt.ui.internal.jpa.common.RefEntityInfo;
import org.hibernate.eclipse.jdt.ui.internal.jpa.common.RefFieldInfo;
import org.hibernate.eclipse.jdt.ui.internal.jpa.common.RefType;
+import org.hibernate.eclipse.jdt.ui.internal.jpa.common.EntityInfo.FieldGetterType;
/**
* Visitor to insert JPA annotations into proper
@@ -204,6 +212,87 @@
lrw.insertBefore(md, insertBeforeNode, null);
}
}
+ if (enableOptLock && entityInfo.isAddVersionFlag() && !entityInfo.hasVersionAnnotation()) {
+ // add property "version", add getter/setter getVersion/setVersion,
+ // add annotation for the property or for the getter
+ //
+ final String version = "version"; //$NON-NLS-1$
+ final String versionType = "Integer"; //$NON-NLS-1$
+ //
+ VariableDeclarationFragment vdFragment = rewriter.getAST().newVariableDeclarationFragment();
+ SimpleName variableName = rewriter.getAST().newSimpleName(version);
+ vdFragment.setName(variableName);
+ FieldDeclaration fieldVersion = rewriter.getAST().newFieldDeclaration(vdFragment);
+ Modifier modifier = rewriter.getAST().newModifier(Modifier.ModifierKeyword.PROTECTED_KEYWORD);
+ fieldVersion.modifiers().add(modifier);
+ Name typeName = rewriter.getAST().newName(versionType);
+ SimpleType type = rewriter.getAST().newSimpleType(typeName);
+ fieldVersion.setType(type);
+ //
+ MethodDeclaration mdGetter = rewriter.getAST().newMethodDeclaration();
+ modifier = rewriter.getAST().newModifier(Modifier.ModifierKeyword.PUBLIC_KEYWORD);
+ mdGetter.modifiers().add(modifier);
+ Block body = rewriter.getAST().newBlock();
+ ReturnStatement returnVersion = rewriter.getAST().newReturnStatement();
+ variableName = rewriter.getAST().newSimpleName(version);
+ returnVersion.setExpression(variableName);
+ body.statements().add(returnVersion);
+ mdGetter.setBody(body);
+ SimpleName sn = rewriter.getAST().newSimpleName("getVersion"); //$NON-NLS-1$
+ mdGetter.setName(sn);
+ typeName = rewriter.getAST().newName(versionType);
+ type = rewriter.getAST().newSimpleType(typeName);
+ mdGetter.setReturnType2(type);
+ //
+ MethodDeclaration mdSetter = rewriter.getAST().newMethodDeclaration();
+ modifier = rewriter.getAST().newModifier(Modifier.ModifierKeyword.PUBLIC_KEYWORD);
+ mdSetter.modifiers().add(modifier);
+ body = rewriter.getAST().newBlock();
+ Assignment assignment = rewriter.getAST().newAssignment();
+ FieldAccess fieldAccess = rewriter.getAST().newFieldAccess();
+ ThisExpression thisExpression = rewriter.getAST().newThisExpression();
+ fieldAccess.setExpression(thisExpression);
+ variableName = rewriter.getAST().newSimpleName(version);
+ fieldAccess.setName(variableName);
+ assignment.setLeftHandSide(fieldAccess);
+ variableName = rewriter.getAST().newSimpleName(version);
+ assignment.setRightHandSide(variableName);
+ ExpressionStatement expressionStatement = rewriter.getAST().newExpressionStatement(assignment);
+ body.statements().add(expressionStatement);
+ mdSetter.setBody(body);
+ sn = rewriter.getAST().newSimpleName("setVersion"); //$NON-NLS-1$
+ mdSetter.setName(sn);
+ SingleVariableDeclaration svd = rewriter.getAST().newSingleVariableDeclaration();
+ variableName = rewriter.getAST().newSimpleName(version);
+ svd.setName(variableName);
+ typeName = rewriter.getAST().newName(versionType);
+ type = rewriter.getAST().newSimpleType(typeName);
+ svd.setType(type);
+ mdSetter.parameters().add(svd);
+ //
+ ListRewrite lrw = rewriter.getListRewrite(node, TypeDeclaration.BODY_DECLARATIONS_PROPERTY);
+ if (entityInfo.getVersionFieldGetter() != FieldGetterType.FIELD &&
+ entityInfo.getVersionFieldGetter() != FieldGetterType.FIELD_GETTER) {
+ lrw.insertLast(fieldVersion, null);
+ }
+ if (entityInfo.getVersionFieldGetter() != FieldGetterType.GETTER &&
+ entityInfo.getVersionFieldGetter() != FieldGetterType.FIELD_GETTER) {
+ lrw.insertLast(mdGetter, null);
+ lrw.insertLast(mdSetter, null);
+ }
+ if (annotationStyle == AnnotStyle.FIELDS) {
+ MarkerAnnotation matd = rewriter.getAST().newMarkerAnnotation();
+ matd.setTypeName(rewriter.getAST().newSimpleName(JPAConst.ANNOTATION_VERSION));
+ lrw = rewriter.getListRewrite(fieldVersion, FieldDeclaration.MODIFIERS2_PROPERTY);
+ lrw.insertFirst(matd, null);
+ }
+ else if (annotationStyle == AnnotStyle.GETTERS) {
+ MarkerAnnotation matd = rewriter.getAST().newMarkerAnnotation();
+ matd.setTypeName(rewriter.getAST().newSimpleName(JPAConst.ANNOTATION_VERSION));
+ lrw = rewriter.getListRewrite(mdGetter, MethodDeclaration.MODIFIERS2_PROPERTY);
+ lrw.insertFirst(matd, null);
+ }
+ }
return true;
}
@@ -254,7 +343,7 @@
lrw.insertFirst(matd, null);
}
}
- if (entityInfo.isAddVersionFlag()) {
+ if (enableOptLock && entityInfo.isAddVersionFlag() && !entityInfo.hasVersionAnnotation()) {
Iterator itVarNames = node.fragments().iterator();
boolean addVersionMarker = false;
while (itVarNames.hasNext()) {
@@ -403,7 +492,7 @@
lrw.insertFirst(matd, null);
}
}
- if (entityInfo.isAddVersionFlag()) {
+ if (enableOptLock && entityInfo.isAddVersionFlag() && !entityInfo.hasVersionAnnotation()) {
boolean addVersionMarker = false;
if ("version".equals(returnIdentifier)) { //$NON-NLS-1$
addVersionMarker = true;
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/wizard/EntitiesList.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/wizard/EntitiesList.java 2009-04-23 13:13:04 UTC (rev 14871)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/wizard/EntitiesList.java 2009-04-23 14:03:12 UTC (rev 14872)
@@ -123,10 +123,10 @@
combolabel.setLayout(layout);
layout.numColumns = 2;
Label labelChoice = new Label(combolabel, SWT.NULL);
- labelChoice.setText(JdtUiMessages.AllEntitiesProcessor_setup_annotation_generation_preference);
+ labelChoice.setText(JdtUiMessages.AllEntitiesProcessor_preferred_location_annotations);
Combo generateChoice = new Combo(combolabel, SWT.READ_ONLY);
- generateChoice.add(JdtUiMessages.AllEntitiesProcessor_annotate_fields);
- generateChoice.add(JdtUiMessages.AllEntitiesProcessor_annotate_getters);
+ generateChoice.add(JdtUiMessages.AllEntitiesProcessor_fields);
+ generateChoice.add(JdtUiMessages.AllEntitiesProcessor_getters);
generateChoice.add(JdtUiMessages.AllEntitiesProcessor_auto_select_from_class_preference);
int idx = 0;
if (params.getAnnotationStyle().equals(AnnotStyle.FIELDS)) {
@@ -160,24 +160,7 @@
};
generateChoice.addModifyListener(mlGenerateChoice);
-
- /** /
- // TODO: implement enable optimistic locking functionality
- Label labelOptLock = new Label(combolabel, SWT.NULL);
- labelOptLock.setText(JdtUiMessages.AllEntitiesProcessor_enable_optimistic_locking);
- Button checkboxOptLock = new Button(combolabel, SWT.CHECK);
- checkboxOptLock.setSelection(params.getEnableOptLock());
- final Listener mlOptLock = new Listener() {
- public void handleEvent(Event e) {
- params.setEnableOptLock(((Button)e.widget).getSelection());
- params.reCollectModification(data.getBufferManager(), data.getEntities());
- }
-
- };
- checkboxOptLock.addListener(SWT.Selection, mlOptLock);
- /**/
-
Label labelDefaultStrLength = new Label(combolabel, SWT.NULL);
labelDefaultStrLength.setText(JdtUiMessages.AllEntitiesProcessor_default_string_length);
Text textDefaultStrLength = new Text(combolabel, SWT.SINGLE | SWT.BORDER | SWT.TRAIL);
@@ -201,13 +184,33 @@
if (e == null || !(e.getSource() instanceof Text)) {
return;
}
- params.setDefaultStrLength(Integer.valueOf(((Text)e.getSource()).getText()));
+ String str = ((Text)e.getSource()).getText();
+ Integer val = IHibernateJPAWizardParams.columnLength;
+ if (str != null && str.length() > 0) {
+ val = Integer.valueOf(str);
+ }
+ params.setDefaultStrLength(val);
params.reCollectModification(data.getBufferManager(), data.getEntities());
}
};
textDefaultStrLength.addModifyListener(mlDefaultStrLength);
+ // enable optimistic locking functionality
+ Label labelOptLock = new Label(combolabel, SWT.NULL);
+ labelOptLock.setText(JdtUiMessages.AllEntitiesProcessor_enable_optimistic_locking);
+ Button checkboxOptLock = new Button(combolabel, SWT.CHECK);
+ checkboxOptLock.setSelection(params.getEnableOptLock());
+ final Listener mlOptLock = new Listener() {
+
+ public void handleEvent(Event e) {
+ params.setEnableOptLock(((Button)e.widget).getSelection());
+ params.reCollectModification(data.getBufferManager(), data.getEntities());
+ }
+
+ };
+ checkboxOptLock.addListener(SWT.Selection, mlOptLock);
+
setControl(container);
}
}
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/wizard/IHibernateJPAWizardParams.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/wizard/IHibernateJPAWizardParams.java 2009-04-23 13:13:04 UTC (rev 14871)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/wizard/IHibernateJPAWizardParams.java 2009-04-23 14:03:12 UTC (rev 14872)
@@ -22,6 +22,10 @@
* @author Vitali
*/
public interface IHibernateJPAWizardParams {
+ /**
+ * @Column length - default value
+ */
+ public final static int columnLength = 255;
public AnnotStyle getAnnotationStyle();
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/fields/Country.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/fields/Country.java 2009-04-23 13:13:04 UTC (rev 14871)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/fields/Country.java 2009-04-23 14:03:12 UTC (rev 14872)
@@ -13,6 +13,7 @@
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.ManyToOne;
+import javax.persistence.Version;
@Entity
public class Country {
@@ -34,4 +35,15 @@
return this.name;
}
+ @Version
+ protected Integer version;
+
+ public Integer getVersion() {
+ return version;
+ }
+
+ public void setVersion(Integer version) {
+ this.version = version;
+ }
+
}
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/fields/DocumentBase.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/fields/DocumentBase.java 2009-04-23 13:13:04 UTC (rev 14871)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/fields/DocumentBase.java 2009-04-23 14:03:12 UTC (rev 14872)
@@ -22,4 +22,12 @@
@Version
protected Integer version;
+
+ public Integer getVersion() {
+ return version;
+ }
+
+ public void setVersion(Integer version) {
+ this.version = version;
+ }
}
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/fields/Foto.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/fields/Foto.java 2009-04-23 13:13:04 UTC (rev 14871)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/fields/Foto.java 2009-04-23 14:03:12 UTC (rev 14872)
@@ -16,6 +16,7 @@
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.OneToOne;
+import javax.persistence.Version;
@Entity
public class Foto {
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/fields/FotoXPerson.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/fields/FotoXPerson.java 2009-04-23 13:13:04 UTC (rev 14871)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/fields/FotoXPerson.java 2009-04-23 14:03:12 UTC (rev 14872)
@@ -17,6 +17,7 @@
import javax.persistence.Id;
import javax.persistence.ManyToOne;
import javax.persistence.OneToMany;
+import javax.persistence.Version;
@Entity
public class FotoXPerson {
@@ -30,4 +31,15 @@
@OneToMany(mappedBy="foto")
protected Set<PersonXFoto> persons = new HashSet<PersonXFoto>(0);
+ @Version
+ protected Integer version;
+
+ public Integer getVersion() {
+ return version;
+ }
+
+ public void setVersion(Integer version) {
+ this.version = version;
+ }
+
}
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/fields/Passport.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/fields/Passport.java 2009-04-23 13:13:04 UTC (rev 14871)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/fields/Passport.java 2009-04-23 14:03:12 UTC (rev 14872)
@@ -13,6 +13,7 @@
import java.util.Map;
import javax.persistence.Entity;
import javax.persistence.OneToMany;
+import javax.persistence.Version;
@Entity
public class Passport extends Document {
@@ -33,4 +34,15 @@
return visas;
}
+ @Version
+ protected Integer version;
+
+ public Integer getVersion() {
+ return version;
+ }
+
+ public void setVersion(Integer version) {
+ this.version = version;
+ }
+
}
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/fields/Person.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/fields/Person.java 2009-04-23 13:13:04 UTC (rev 14871)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/fields/Person.java 2009-04-23 14:03:12 UTC (rev 14872)
@@ -17,6 +17,7 @@
import javax.persistence.Id;
import javax.persistence.OneToMany;
import javax.persistence.OneToOne;
+import javax.persistence.Version;
@Entity
public class Person {
@@ -56,4 +57,15 @@
this.foto = foto;
}
+ @Version
+ protected Integer version;
+
+ public Integer getVersion() {
+ return version;
+ }
+
+ public void setVersion(Integer version) {
+ this.version = version;
+ }
+
}
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/fields/PersonXFoto.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/fields/PersonXFoto.java 2009-04-23 13:13:04 UTC (rev 14871)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/fields/PersonXFoto.java 2009-04-23 14:03:12 UTC (rev 14872)
@@ -17,6 +17,7 @@
import javax.persistence.Id;
import javax.persistence.ManyToOne;
import javax.persistence.OneToMany;
+import javax.persistence.Version;
@Entity
public class PersonXFoto {
@@ -30,4 +31,15 @@
@OneToMany(mappedBy="person")
protected Set<FotoXPerson> fotos = new HashSet<FotoXPerson>(0);
+ @Version
+ protected Integer version;
+
+ public Integer getVersion() {
+ return version;
+ }
+
+ public void setVersion(Integer version) {
+ this.version = version;
+ }
+
}
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/fields/Staff.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/fields/Staff.java 2009-04-23 13:13:04 UTC (rev 14871)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/fields/Staff.java 2009-04-23 14:03:12 UTC (rev 14872)
@@ -11,6 +11,7 @@
package test.annotated.fields;
import javax.persistence.Entity;
+import javax.persistence.Version;
@Entity
public class Staff extends Document {
@@ -24,4 +25,15 @@
this.code = code;
setDocType((byte)2);
}
+
+ @Version
+ protected Integer version;
+
+ public Integer getVersion() {
+ return version;
+ }
+
+ public void setVersion(Integer version) {
+ this.version = version;
+ }
}
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/fields/Visa.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/fields/Visa.java 2009-04-23 13:13:04 UTC (rev 14871)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/fields/Visa.java 2009-04-23 14:03:12 UTC (rev 14872)
@@ -12,6 +12,7 @@
import javax.persistence.Entity;
import javax.persistence.OneToMany;
+import javax.persistence.Version;
/**
* @author Dmitry Geraskov
@@ -28,4 +29,15 @@
this.countries = countries;
}
+ @Version
+ protected Integer version;
+
+ public Integer getVersion() {
+ return version;
+ }
+
+ public void setVersion(Integer version) {
+ this.version = version;
+ }
+
}
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/Country.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/Country.java 2009-04-23 13:13:04 UTC (rev 14871)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/Country.java 2009-04-23 14:03:12 UTC (rev 14872)
@@ -11,6 +11,7 @@
package test.annotated.getters;
import javax.persistence.Entity;
+import javax.persistence.Version;
@Entity
public class Country {
@@ -28,4 +29,15 @@
return this.name;
}
+ protected Integer version;
+
+ @Version
+ public Integer getVersion() {
+ return version;
+ }
+
+ public void setVersion(Integer version) {
+ this.version = version;
+ }
+
}
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/FotoXPerson.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/FotoXPerson.java 2009-04-23 13:13:04 UTC (rev 14871)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/FotoXPerson.java 2009-04-23 14:03:12 UTC (rev 14872)
@@ -17,6 +17,7 @@
import javax.persistence.Id;
import javax.persistence.ManyToOne;
import javax.persistence.OneToMany;
+import javax.persistence.Version;
@Entity
public class FotoXPerson {
@@ -53,4 +54,15 @@
public void setPersons(Set<PersonXFoto> persons) {
this.persons = persons;
}
+
+ protected Integer version;
+
+ @Version
+ public Integer getVersion() {
+ return version;
+ }
+
+ public void setVersion(Integer version) {
+ this.version = version;
+ }
}
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/Passport.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/Passport.java 2009-04-23 13:13:04 UTC (rev 14871)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/Passport.java 2009-04-23 14:03:12 UTC (rev 14872)
@@ -14,6 +14,7 @@
import javax.persistence.Entity;
import javax.persistence.OneToMany;
+import javax.persistence.Version;
@Entity
public class Passport extends Document {
@@ -35,4 +36,14 @@
return visas;
}
+ protected Integer version;
+
+ @Version
+ public Integer getVersion() {
+ return version;
+ }
+
+ public void setVersion(Integer version) {
+ this.version = version;
+ }
}
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/Person.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/Person.java 2009-04-23 13:13:04 UTC (rev 14871)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/Person.java 2009-04-23 14:03:12 UTC (rev 14872)
@@ -17,6 +17,7 @@
import javax.persistence.Id;
import javax.persistence.OneToMany;
import javax.persistence.OneToOne;
+import javax.persistence.Version;
@Entity
public class Person {
@@ -56,4 +57,15 @@
this.foto = foto;
}
+ protected Integer version;
+
+ @Version
+ public Integer getVersion() {
+ return version;
+ }
+
+ public void setVersion(Integer version) {
+ this.version = version;
+ }
+
}
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/PersonXFoto.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/PersonXFoto.java 2009-04-23 13:13:04 UTC (rev 14871)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/PersonXFoto.java 2009-04-23 14:03:12 UTC (rev 14872)
@@ -17,6 +17,7 @@
import javax.persistence.Id;
import javax.persistence.ManyToOne;
import javax.persistence.OneToMany;
+import javax.persistence.Version;
@Entity
public class PersonXFoto {
@@ -53,4 +54,15 @@
public void setFotos(Set<FotoXPerson> fotos) {
this.fotos = fotos;
}
+
+ protected Integer version;
+
+ @Version
+ public Integer getVersion() {
+ return version;
+ }
+
+ public void setVersion(Integer version) {
+ this.version = version;
+ }
}
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/Staff.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/Staff.java 2009-04-23 13:13:04 UTC (rev 14871)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/Staff.java 2009-04-23 14:03:12 UTC (rev 14872)
@@ -11,6 +11,7 @@
package test.annotated.getters;
import javax.persistence.Entity;
+import javax.persistence.Version;
@Entity
public class Staff extends Document {
@@ -24,4 +25,15 @@
this.code = code;
setDocType((byte)2);
}
+
+ protected Integer version;
+
+ @Version
+ public Integer getVersion() {
+ return version;
+ }
+
+ public void setVersion(Integer version) {
+ this.version = version;
+ }
}
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/Visa.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/Visa.java 2009-04-23 13:13:04 UTC (rev 14871)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/Visa.java 2009-04-23 14:03:12 UTC (rev 14872)
@@ -12,6 +12,7 @@
import javax.persistence.Entity;
import javax.persistence.OneToMany;
+import javax.persistence.Version;
/**
* @author Dmitry Geraskov
@@ -46,4 +47,15 @@
public setCountries(Country[] countries){
this.countries = countries;
}
+
+ protected Integer version;
+
+ @Version
+ public Integer getVersion() {
+ return version;
+ }
+
+ public void setVersion(Integer version) {
+ this.version = version;
+ }
}
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/JPAMapTest.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/JPAMapTest.java 2009-04-23 13:13:04 UTC (rev 14871)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/JPAMapTest.java 2009-04-23 14:03:12 UTC (rev 14872)
@@ -138,6 +138,7 @@
collector.collect(icu4);
}
collector.resolveRelations();
+ processor.setEnableOptLock(true);
processor.modify(javaProject, collector.getMapCUs_Info(), false);
//
checkItem("DocumentBase"); //$NON-NLS-1$
15 years, 8 months
- 1
- 0
JBoss Tools SVN: r14871 - in trunk/seam/plugins/org.jboss.tools.seam.ui: src/org/jboss/tools/seam/ui and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-04-23 09:13:04 -0400 (Thu, 23 Apr 2009)
New Revision: 14871
Added:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/actions/RenameComponentAction.java
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamUIMessages.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/refactoring/SeamComponentRenameHandler.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/actions/SeamActionProvider.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-1077
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml 2009-04-23 13:12:04 UTC (rev 14870)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml 2009-04-23 13:13:04 UTC (rev 14871)
@@ -661,5 +661,9 @@
</handler>
</extension>
+ <extension point="org.jboss.tools.common.model.classes">
+ <xclass id="org.jboss.tools.seam.ui.views.actions.RenameComponentAction"
+ class="org.jboss.tools.seam.ui.views.actions.RenameComponentAction"/>
+ </extension>
</plugin>
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamUIMessages.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamUIMessages.java 2009-04-23 13:12:04 UTC (rev 14870)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamUIMessages.java 2009-04-23 13:13:04 UTC (rev 14871)
@@ -381,6 +381,8 @@
public static String SeamRuntimeListFieldEditor_ActionEdit;
public static String SeamRuntimeListFieldEditor_ActionRemove;
+
+ public static String RENAME_SEAM_COMPONENT;
static {
// load message values from bundle file
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties 2009-04-23 13:12:04 UTC (rev 14870)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties 2009-04-23 13:13:04 UTC (rev 14871)
@@ -199,4 +199,5 @@
POJO_CLASS_ALREADY_EXISTS=Such POJO class already exists!
ENTITY_CLASS_ALREADY_EXISTS=Such entity class already exists!
PAGE_ALREADY_EXISTS=Such page already exists!
-MASTER_PAGE_ALREADY_EXISTS=Such master page already exists!
\ No newline at end of file
+MASTER_PAGE_ALREADY_EXISTS=Such master page already exists!
+RENAME_SEAM_COMPONENT = Rename Seam Component
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/refactoring/SeamComponentRenameHandler.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/refactoring/SeamComponentRenameHandler.java 2009-04-23 13:12:04 UTC (rev 14870)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/refactoring/SeamComponentRenameHandler.java 2009-04-23 13:13:04 UTC (rev 14871)
@@ -60,18 +60,23 @@
component = components.iterator().next();
}
}
- RenameComponentProcessor processor = new RenameComponentProcessor(component);
- RenameComponentRefactoring refactoring = new RenameComponentRefactoring(processor);
- RenameComponentWizard wizard = new RenameComponentWizard(refactoring, component);
- RefactoringWizardOpenOperation op = new RefactoringWizardOpenOperation(wizard);
- try {
- String titleForFailedChecks = "TestTestTest"; //$NON-NLS-1$
- op.run(activeShell, titleForFailedChecks);
- } catch (final InterruptedException irex) {
- // operation was canceled
- }
+
+ invokeRenameWizard(component, activeShell);
}
return null;
}
-}
\ No newline at end of file
+
+ public static void invokeRenameWizard(ISeamComponent component, Shell activeShell) {
+ RenameComponentProcessor processor = new RenameComponentProcessor(component);
+ RenameComponentRefactoring refactoring = new RenameComponentRefactoring(processor);
+ RenameComponentWizard wizard = new RenameComponentWizard(refactoring, component);
+ RefactoringWizardOpenOperation op = new RefactoringWizardOpenOperation(wizard);
+ try {
+ String titleForFailedChecks = "TestTestTest"; //$NON-NLS-1$
+ op.run(activeShell, titleForFailedChecks);
+ } catch (final InterruptedException irex) {
+ // operation was canceled
+ }
+ }
+}
Added: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/actions/RenameComponentAction.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/actions/RenameComponentAction.java (rev 0)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/actions/RenameComponentAction.java 2009-04-23 13:13:04 UTC (rev 14871)
@@ -0,0 +1,86 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.seam.ui.views.actions;
+
+import java.util.Set;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.jface.action.Action;
+import org.eclipse.swt.widgets.Shell;
+import org.jboss.tools.common.meta.action.SpecialWizard;
+import org.jboss.tools.common.model.XModelObject;
+import org.jboss.tools.common.model.util.EclipseResourceUtil;
+import org.jboss.tools.seam.core.ISeamComponent;
+import org.jboss.tools.seam.core.ISeamProject;
+import org.jboss.tools.seam.core.ISeamXmlComponentDeclaration;
+import org.jboss.tools.seam.core.SeamCorePlugin;
+import org.jboss.tools.seam.internal.core.SeamObject;
+import org.jboss.tools.seam.ui.SeamGuiPlugin;
+import org.jboss.tools.seam.ui.SeamUIMessages;
+import org.jboss.tools.seam.ui.refactoring.SeamComponentRenameHandler;
+
+/**
+ * Rename component action for Seam Components view.
+ * @author Viacheslav Kabanovich
+ */
+public class RenameComponentAction extends Action implements SpecialWizard {
+ ISeamComponent component;
+
+ public RenameComponentAction() {
+ }
+
+ public RenameComponentAction(ISeamComponent component) {
+ setText(SeamUIMessages.RENAME_SEAM_COMPONENT);
+ this.component = component;
+ }
+
+ @Override
+ public void run() {
+ if(component != null) {
+ Shell activeShell = SeamGuiPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getShell();
+ SeamComponentRenameHandler.invokeRenameWizard(component, activeShell);
+ }
+ }
+
+ public int execute() {
+ run();
+ return 0;
+ }
+
+ public void setObject(Object object) {
+ if(object instanceof XModelObject) {
+ XModelObject o = (XModelObject)object;
+ IProject project = EclipseResourceUtil.getProject(o);
+ if(project == null) return;
+ ISeamProject seamProject = SeamCorePlugin.getSeamProject(project, true);
+ if(seamProject == null) return;
+ ISeamComponent[] cs = seamProject.getComponents();
+ for (ISeamComponent c: cs) {
+ Set<ISeamXmlComponentDeclaration> ds = c.getXmlDeclarations();
+ if(ds == null || ds.size() == 0) continue;
+ ISeamXmlComponentDeclaration d = ds.iterator().next();
+ Object id = ((SeamObject)d).getId();
+ if(id == o) {
+ component = c;
+ break;
+ }
+ }
+ if(component == null) {
+ String name = o.getAttributeValue("name");
+ if(name != null && name.length() > 0) {
+ component = seamProject.getComponent(name);
+ }
+ }
+ }
+
+ }
+
+}
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/actions/SeamActionProvider.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/actions/SeamActionProvider.java 2009-04-23 13:12:04 UTC (rev 14870)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/actions/SeamActionProvider.java 2009-04-23 13:13:04 UTC (rev 14871)
@@ -21,6 +21,7 @@
import org.eclipse.ui.navigator.CommonActionProvider;
import org.eclipse.ui.navigator.ICommonActionConstants;
import org.jboss.tools.seam.core.IOpenableElement;
+import org.jboss.tools.seam.core.ISeamComponent;
import org.jboss.tools.seam.core.ISeamElement;
/**
@@ -46,6 +47,11 @@
}
}
+ if(e instanceof ISeamComponent) {
+ ISeamComponent component = (ISeamComponent)e;
+ RenameComponentAction action = new RenameComponentAction(component);
+ menu.add(action);
+ }
}
@Override
15 years, 8 months
- 1
- 0
JBoss Tools SVN: r14870 - in trunk/seam/plugins/org.jboss.tools.seam.xml: META-INF and 5 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-04-23 09:12:04 -0400 (Thu, 23 Apr 2009)
New Revision: 14870
Added:
trunk/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/components/model/handlers/
trunk/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/components/model/handlers/RenameComponentHandler.java
Modified:
trunk/seam/plugins/org.jboss.tools.seam.xml/META-INF/MANIFEST.MF
trunk/seam/plugins/org.jboss.tools.seam.xml/plugin.xml
trunk/seam/plugins/org.jboss.tools.seam.xml/resources/help/keys-seam-menu.properties
trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-async.meta
trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-components.meta
trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-core.meta
trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-drools.meta
trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-framework.meta
trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-international.meta
trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-jms.meta
trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-mail.meta
trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-pdf.meta
trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-persistence.meta
trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-remoting.meta
trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-security.meta
trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-spring.meta
trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-theme.meta
trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-transaction.meta
trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-ui.meta
trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-web.meta
trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-wicket.meta
trunk/seam/plugins/org.jboss.tools.seam.xml/schemas/components-2.1.xsd
trunk/seam/plugins/org.jboss.tools.seam.xml/schemas/security-2.1.xsd
Log:
https://jira.jboss.org/jira/browse/JBIDE-1077
Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/META-INF/MANIFEST.MF
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.xml/META-INF/MANIFEST.MF 2009-04-23 12:58:53 UTC (rev 14869)
+++ trunk/seam/plugins/org.jboss.tools.seam.xml/META-INF/MANIFEST.MF 2009-04-23 13:12:04 UTC (rev 14870)
@@ -9,6 +9,7 @@
Bundle-Localization: plugin
Provide-Package: org.jboss.tools.seam.xml,
org.jboss.tools.seam.xml.components.model,
+ org.jboss.tools.seam.xml.components.model.handlers,
org.jboss.tools.seam.xml.components.model.constraint
Require-Bundle: org.jboss.tools.jst.web;visibility:=reexport,
org.eclipse.ui.ide,
Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/plugin.xml
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.xml/plugin.xml 2009-04-23 12:58:53 UTC (rev 14869)
+++ trunk/seam/plugins/org.jboss.tools.seam.xml/plugin.xml 2009-04-23 13:12:04 UTC (rev 14870)
@@ -53,6 +53,9 @@
<xclass id="org.jboss.tools.seam.xml.components.model.constraint.ListIntELConstraint"
class="org.jboss.tools.seam.xml.components.model.constraint.ListIntELConstraint"/>
+ <xclass id="org.jboss.tools.seam.xml.components.model.handlers.RenameComponentHandler"
+ class="org.jboss.tools.seam.xml.components.model.handlers.RenameComponentHandler"/>
+
<xclass id="org.jboss.tools.seam.xml.components.model.SeamPromptingProvider"
class="org.jboss.tools.seam.xml.components.model.SeamPromptingProvider"/>
Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/help/keys-seam-menu.properties
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/help/keys-seam-menu.properties 2009-04-23 12:58:53 UTC (rev 14869)
+++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/help/keys-seam-menu.properties 2009-04-23 13:12:04 UTC (rev 14870)
@@ -99,3 +99,4 @@
Seam.AddWicketFilter.menu=Wicket Filter...
Seam.Wicket.menu=Wicket
Seam.AddWebApplication.menu=Web Application...
+Seam.Rename=Rename1
Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-async.meta
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-async.meta 2009-04-23 12:58:53 UTC (rev 14869)
+++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-async.meta 2009-04-23 13:12:04 UTC (rev 14870)
@@ -57,7 +57,9 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions"/>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
<XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
@@ -103,7 +105,9 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions"/>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
<XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
@@ -150,7 +154,9 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions"/>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
<XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-components.meta
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-components.meta 2009-04-23 12:58:53 UTC (rev 14869)
+++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-components.meta 2009-04-23 13:12:04 UTC (rev 14870)
@@ -1363,7 +1363,11 @@
PROPERTIES="actionList=CreateActions" displayName="Property..."
kind="action" name="AddAnyProperty"/>
</XActionItem>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItem
+ HandlerClassName="org.jboss.tools.seam.xml.components.model.handlers.RenameComponentHandler"
+ displayName="Rename Seam Component" kind="action" name="Rename"/>
+ </XActionItem>
<XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
<XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
@@ -1500,7 +1504,11 @@
PROPERTIES="actionList=CreateActions" displayName="Property..."
kind="action" name="AddAnyProperty"/>
</XActionItem>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItem
+ HandlerClassName="org.jboss.tools.seam.xml.components.model.handlers.RenameComponentHandler"
+ displayName="Rename Seam Component" kind="action" name="Rename"/>
+ </XActionItem>
<XActionItemReference entity="SeamComponent" name="CopyActions" path="CopyActions"/>
<XActionItemReference entity="SeamComponent" name="DeleteActions" path="DeleteActions"/>
<XActionItemReference entity="SeamComponent" name="Properties" path="Properties"/>
@@ -1563,7 +1571,11 @@
PROPERTIES="actionList=CreateActions" displayName="Property..."
kind="action" name="AddAnyProperty"/>
</XActionItem>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItem
+ HandlerClassName="org.jboss.tools.seam.xml.components.model.handlers.RenameComponentHandler"
+ displayName="Rename Seam Component" kind="action" name="Rename"/>
+ </XActionItem>
<XActionItemReference entity="SeamComponent" name="CopyActions" path="CopyActions"/>
<XActionItemReference entity="SeamComponent" name="DeleteActions" path="DeleteActions"/>
<XActionItemReference entity="SeamComponent" name="Properties" path="Properties"/>
Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-core.meta
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-core.meta 2009-04-23 12:58:53 UTC (rev 14869)
+++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-core.meta 2009-04-23 13:12:04 UTC (rev 14870)
@@ -67,7 +67,9 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions"/>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
<XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
@@ -116,7 +118,9 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions"/>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
<XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
@@ -277,7 +281,9 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions"/>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
<XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
@@ -380,7 +386,9 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions"/>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
<XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
@@ -426,7 +434,9 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions"/>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
<XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
@@ -476,7 +486,9 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions"/>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
<XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
@@ -525,7 +537,9 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions"/>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
<XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
@@ -657,7 +671,9 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions"/>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
<XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
@@ -723,7 +739,9 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions"/>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
<XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
@@ -791,7 +809,9 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions"/>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItemReference entity="SeamCoreInit20" name="CopyActions" path="CopyActions"/>
<XActionItemReference entity="SeamCoreInit20" name="DeleteActions" path="DeleteActions"/>
<XActionItemReference entity="SeamCoreInit20" name="Properties" path="Properties"/>
@@ -860,7 +880,9 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions"/>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
<XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
@@ -915,7 +937,9 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions"/>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
<XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
@@ -967,7 +991,9 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions"/>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
<XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
@@ -1023,7 +1049,9 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions"/>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
<XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
@@ -1083,7 +1111,9 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions"/>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItemReference entity="SeamCoreManager" name="CopyActions" path="CopyActions"/>
<XActionItemReference entity="SeamCoreManager" name="DeleteActions" path="DeleteActions"/>
<XActionItemReference entity="SeamCoreManager" name="Properties" path="Properties"/>
@@ -1115,7 +1145,9 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions"/>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
<XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
@@ -1223,7 +1255,9 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions"/>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
<XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
@@ -1388,7 +1422,9 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions"/>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
<XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
@@ -1494,7 +1530,9 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions"/>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
<XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
@@ -1543,7 +1581,9 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions"/>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
<XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
@@ -1598,7 +1638,9 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions"/>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
<XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
@@ -1644,7 +1686,9 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions"/>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
<XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-drools.meta
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-drools.meta 2009-04-23 12:58:53 UTC (rev 14869)
+++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-drools.meta 2009-04-23 13:12:04 UTC (rev 14870)
@@ -54,7 +54,9 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions"/>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
<XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
@@ -107,7 +109,9 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions"/>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
<XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
@@ -155,7 +159,9 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions"/>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
<XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-framework.meta
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-framework.meta 2009-04-23 12:58:53 UTC (rev 14869)
+++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-framework.meta 2009-04-23 13:12:04 UTC (rev 14870)
@@ -108,7 +108,9 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions"/>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
<XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
@@ -163,7 +165,9 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions"/>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
<XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
@@ -220,7 +224,9 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions"/>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItemReference entity="SeamFrameworkEntityQuery"
name="CopyActions" path="CopyActions"/>
<XActionItemReference entity="SeamFrameworkEntityQuery"
@@ -292,7 +298,9 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions"/>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
<XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
@@ -357,7 +365,9 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions"/>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
<XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
@@ -424,7 +434,9 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions"/>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItemReference entity="SeamFrameworkHibernateEntityQuery"
name="CopyActions" path="CopyActions"/>
<XActionItemReference entity="SeamFrameworkHibernateEntityQuery"
Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-international.meta
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-international.meta 2009-04-23 12:58:53 UTC (rev 14869)
+++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-international.meta 2009-04-23 13:12:04 UTC (rev 14870)
@@ -62,7 +62,9 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions"/>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
<XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
@@ -120,7 +122,9 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions"/>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
<XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
@@ -171,7 +175,9 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions"/>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItemReference entity="SeamCoreLocaleSelector20"
name="CopyActions" path="CopyActions"/>
<XActionItemReference entity="SeamCoreLocaleSelector20"
Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-jms.meta
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-jms.meta 2009-04-23 12:58:53 UTC (rev 14869)
+++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-jms.meta 2009-04-23 13:12:04 UTC (rev 14870)
@@ -55,7 +55,9 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions"/>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
<XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
@@ -100,7 +102,9 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions"/>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
<XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
@@ -148,7 +152,9 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions"/>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
<XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
@@ -194,7 +200,9 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions"/>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
<XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-mail.meta
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-mail.meta 2009-04-23 12:58:53 UTC (rev 14869)
+++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-mail.meta 2009-04-23 13:12:04 UTC (rev 14870)
@@ -112,7 +112,9 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions"/>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
<XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
@@ -171,7 +173,9 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions"/>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
<XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
@@ -250,7 +254,9 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions"/>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
<XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-pdf.meta
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-pdf.meta 2009-04-23 12:58:53 UTC (rev 14869)
+++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-pdf.meta 2009-04-23 13:12:04 UTC (rev 14870)
@@ -53,7 +53,9 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions"/>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
<XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
@@ -102,7 +104,9 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions"/>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
<XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-persistence.meta
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-persistence.meta 2009-04-23 12:58:53 UTC (rev 14869)
+++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-persistence.meta 2009-04-23 13:12:04 UTC (rev 14870)
@@ -114,7 +114,9 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions"/>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
<XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
@@ -169,7 +171,9 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions"/>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
<XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
@@ -281,7 +285,9 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions"/>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
<XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
@@ -337,7 +343,9 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions"/>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItemReference entity="SeamPersistenceHibernateSessionFactory"
name="CopyActions" path="CopyActions"/>
<XActionItemReference entity="SeamPersistenceHibernateSessionFactory"
@@ -379,7 +387,9 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions"/>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
<XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
@@ -430,7 +440,9 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions"/>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
<XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-remoting.meta
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-remoting.meta 2009-04-23 12:58:53 UTC (rev 14869)
+++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-remoting.meta 2009-04-23 13:12:04 UTC (rev 14870)
@@ -56,7 +56,9 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions"/>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItemReference entity="SeamRemotingConfig20"
name="CopyActions" path="CopyActions"/>
<XActionItemReference entity="SeamRemotingConfig20"
@@ -101,7 +103,9 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions"/>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
<XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
@@ -161,7 +165,9 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions"/>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
<XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-security.meta
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-security.meta 2009-04-23 12:58:53 UTC (rev 14869)
+++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-security.meta 2009-04-23 13:12:04 UTC (rev 14870)
@@ -54,7 +54,9 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions"/>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
<XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
@@ -120,7 +122,9 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions"/>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
<XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
@@ -178,7 +182,9 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions"/>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItemReference entity="SeamSecurityIdentity"
name="CopyActions" path="CopyActions"/>
<XActionItemReference entity="SeamSecurityIdentity"
@@ -216,7 +222,9 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions"/>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItemReference entity="SeamSecurityIdentity"
name="CopyActions" path="CopyActions"/>
<XActionItemReference entity="SeamSecurityIdentity"
@@ -254,7 +262,9 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions"/>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItemReference entity="SeamSecurityIdentity"
name="CopyActions" path="CopyActions"/>
<XActionItemReference entity="SeamSecurityIdentity"
@@ -294,7 +304,9 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions"/>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItemReference entity="SeamSecurityIdentity"
name="CopyActions" path="CopyActions"/>
<XActionItemReference entity="SeamSecurityIdentity"
@@ -335,7 +347,9 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions"/>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItemReference entity="SeamSecurityIdentity"
name="CopyActions" path="CopyActions"/>
<XActionItemReference entity="SeamSecurityIdentity"
@@ -411,7 +425,9 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions"/>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItemReference entity="SeamSecurityIdentity"
name="CopyActions" path="CopyActions"/>
<XActionItemReference entity="SeamSecurityIdentity"
@@ -448,7 +464,9 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions"/>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItemReference entity="SeamSecurityIdentity"
name="CopyActions" path="CopyActions"/>
<XActionItemReference entity="SeamSecurityIdentity"
@@ -487,7 +505,9 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions"/>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItemReference entity="SeamSecurityIdentity"
name="CopyActions" path="CopyActions"/>
<XActionItemReference entity="SeamSecurityIdentity"
@@ -525,7 +545,9 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions"/>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItemReference entity="SeamSecurityIdentity"
name="CopyActions" path="CopyActions"/>
<XActionItemReference entity="SeamSecurityIdentity"
Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-spring.meta
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-spring.meta 2009-04-23 12:58:53 UTC (rev 14869)
+++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-spring.meta 2009-04-23 13:12:04 UTC (rev 14870)
@@ -113,7 +113,9 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions"/>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
<XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
@@ -164,7 +166,9 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions"/>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
<XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
@@ -230,7 +234,9 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions"/>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
<XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-theme.meta
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-theme.meta 2009-04-23 12:58:53 UTC (rev 14869)
+++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-theme.meta 2009-04-23 13:12:04 UTC (rev 14870)
@@ -121,7 +121,9 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions"/>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
<XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
@@ -179,7 +181,9 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions"/>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
<XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-transaction.meta
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-transaction.meta 2009-04-23 12:58:53 UTC (rev 14869)
+++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-transaction.meta 2009-04-23 13:12:04 UTC (rev 14870)
@@ -54,7 +54,9 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions"/>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
<XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
@@ -100,7 +102,9 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions"/>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
<XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
@@ -147,7 +151,9 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions"/>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
<XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
@@ -194,7 +200,9 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions"/>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
<XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-ui.meta
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-ui.meta 2009-04-23 12:58:53 UTC (rev 14869)
+++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-ui.meta 2009-04-23 13:12:04 UTC (rev 14870)
@@ -50,7 +50,9 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions"/>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItemReference entity="SeamRemotingConfig20"
name="CopyActions" path="CopyActions"/>
<XActionItemReference entity="SeamRemotingConfig20"
@@ -87,7 +89,9 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions"/>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItemReference entity="SeamRemotingConfig20"
name="CopyActions" path="CopyActions"/>
<XActionItemReference entity="SeamRemotingConfig20"
@@ -123,7 +127,9 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions"/>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItemReference entity="SeamRemotingConfig20"
name="CopyActions" path="CopyActions"/>
<XActionItemReference entity="SeamRemotingConfig20"
Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-web.meta
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-web.meta 2009-04-23 12:58:53 UTC (rev 14869)
+++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-web.meta 2009-04-23 13:12:04 UTC (rev 14870)
@@ -73,6 +73,9 @@
</XModelAttribute>
</XModelAttributes>
<XActionItem kind="list">
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItemReference entity="SeamWebContextFilter"
name="CopyActions" path="CopyActions"/>
<XActionItemReference entity="SeamWebContextFilter"
@@ -116,6 +119,9 @@
</XModelAttribute>
</XModelAttributes>
<XActionItem kind="list">
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItemReference entity="SeamWebContextFilter"
name="CopyActions" path="CopyActions"/>
<XActionItemReference entity="SeamWebContextFilter"
@@ -162,6 +168,9 @@
</XModelAttribute>
</XModelAttributes>
<XActionItem kind="list">
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItemReference entity="SeamWebContextFilter"
name="CopyActions" path="CopyActions"/>
<XActionItemReference entity="SeamWebContextFilter"
@@ -197,7 +206,9 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions"/>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
<XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
@@ -253,6 +264,9 @@
</XModelAttribute>
</XModelAttributes>
<XActionItem kind="list">
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItemReference entity="SeamWebContextFilter"
name="CopyActions" path="CopyActions"/>
<XActionItemReference entity="SeamWebContextFilter"
@@ -287,6 +301,9 @@
</XModelAttribute>
</XModelAttributes>
<XActionItem kind="list">
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItemReference entity="SeamWebContextFilter"
name="CopyActions" path="CopyActions"/>
<XActionItemReference entity="SeamWebContextFilter"
@@ -323,6 +340,9 @@
</XModelAttribute>
</XModelAttributes>
<XActionItem kind="list">
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItemReference entity="SeamWebContextFilter"
name="CopyActions" path="CopyActions"/>
<XActionItemReference entity="SeamWebContextFilter"
@@ -359,6 +379,9 @@
</XModelAttribute>
</XModelAttributes>
<XActionItem kind="list">
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItemReference entity="SeamWebContextFilter"
name="CopyActions" path="CopyActions"/>
<XActionItemReference entity="SeamWebContextFilter"
@@ -395,6 +418,9 @@
</XModelAttribute>
</XModelAttributes>
<XActionItem kind="list">
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItemReference entity="SeamWebContextFilter"
name="CopyActions" path="CopyActions"/>
<XActionItemReference entity="SeamWebContextFilter"
@@ -431,6 +457,9 @@
</XModelAttribute>
</XModelAttributes>
<XActionItem kind="list">
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItemReference entity="SeamWebContextFilter"
name="CopyActions" path="CopyActions"/>
<XActionItemReference entity="SeamWebContextFilter"
@@ -478,6 +507,9 @@
</XModelAttribute>
</XModelAttributes>
<XActionItem kind="list">
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItemReference entity="SeamWebContextFilter"
name="CopyActions" path="CopyActions"/>
<XActionItemReference entity="SeamWebContextFilter"
@@ -527,6 +559,9 @@
</XModelAttribute>
</XModelAttributes>
<XActionItem kind="list">
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItemReference entity="SeamWebContextFilter"
name="CopyActions" path="CopyActions"/>
<XActionItemReference entity="SeamWebContextFilter"
@@ -561,6 +596,9 @@
</XModelAttribute>
</XModelAttributes>
<XActionItem kind="list">
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItemReference entity="SeamWebContextFilter"
name="CopyActions" path="CopyActions"/>
<XActionItemReference entity="SeamWebContextFilter"
@@ -597,6 +635,9 @@
</XModelAttribute>
</XModelAttributes>
<XActionItem kind="list">
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItemReference entity="SeamWebContextFilter"
name="CopyActions" path="CopyActions"/>
<XActionItemReference entity="SeamWebContextFilter"
@@ -631,6 +672,9 @@
</XModelAttribute>
</XModelAttributes>
<XActionItem kind="list">
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItemReference entity="SeamWebContextFilter"
name="CopyActions" path="CopyActions"/>
<XActionItemReference entity="SeamWebContextFilter"
@@ -672,6 +716,9 @@
</XModelAttribute>
</XModelAttributes>
<XActionItem kind="list">
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItemReference entity="SeamWebContextFilter"
name="CopyActions" path="CopyActions"/>
<XActionItemReference entity="SeamWebContextFilter"
@@ -713,6 +760,9 @@
</XModelAttribute>
</XModelAttributes>
<XActionItem kind="list">
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItemReference entity="SeamWebContextFilter"
name="CopyActions" path="CopyActions"/>
<XActionItemReference entity="SeamWebContextFilter"
@@ -768,6 +818,9 @@
</XModelAttribute>
</XModelAttributes>
<XActionItem kind="list">
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItemReference entity="SeamWebContextFilter"
name="CopyActions" path="CopyActions"/>
<XActionItemReference entity="SeamWebContextFilter"
Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-wicket.meta
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-wicket.meta 2009-04-23 12:58:53 UTC (rev 14869)
+++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-wicket.meta 2009-04-23 13:12:04 UTC (rev 14870)
@@ -55,7 +55,9 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions"/>
- <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
<XActionItemReference entity="SeamRemotingConfig20"
name="CopyActions" path="CopyActions"/>
<XActionItemReference entity="SeamRemotingConfig20"
Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/schemas/components-2.1.xsd
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.xml/schemas/components-2.1.xsd 2009-04-23 12:58:53 UTC (rev 14869)
+++ trunk/seam/plugins/org.jboss.tools.seam.xml/schemas/components-2.1.xsd 2009-04-23 13:12:04 UTC (rev 14870)
@@ -219,6 +219,11 @@
<xs:documentation>The property name</xs:documentation>
</xs:annotation>
</xs:attribute>
+ <xs:attribute name="type" type="components:string" >
+ <xs:annotation>
+ <xs:documentation>Concrete type to use if the property is multi-valued</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
</xs:attributeGroup>
@@ -344,7 +349,16 @@
<xs:enumeration value="APPLICATION"/>
</xs:restriction>
</xs:simpleType>
-
+ <xs:simpleType name="implementationType">
+ <xs:restriction base="xs:token">
+ <xs:enumeration value="hash"/>
+ <xs:enumeration value="linked"/>
+ <xs:enumeration value="tree"/>
+ <xs:enumeration value="HASH"/>
+ <xs:enumeration value="LINKED"/>
+ <xs:enumeration value="TREE"/>
+ </xs:restriction>
+ </xs:simpleType>
<xs:simpleType name="precedenceType">
<xs:restriction base="xs:int">
<xs:enumeration value="0"/>
Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/schemas/security-2.1.xsd
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.xml/schemas/security-2.1.xsd 2009-04-23 12:58:53 UTC (rev 14869)
+++ trunk/seam/plugins/org.jboss.tools.seam.xml/schemas/security-2.1.xsd 2009-04-23 13:12:04 UTC (rev 14870)
@@ -12,22 +12,23 @@
</xs:complexType>
</xs:element>
- <xs:element name="faces-security-events">
- <xs:complexType mixed="true">
- <xs:attributeGroup ref="components:attlist.component"/>
- <xs:attributeGroup ref="security:attlist.faces-security-events"/>
- </xs:complexType>
- </xs:element>
-
<xs:attributeGroup name="attlist.identity">
<xs:attribute name="authenticate-method" type="components:expressionType"/>
<xs:attribute name="remember-me" type="components:boolean"/>
<xs:attribute name="jaas-config-name" type="components:string"/>
</xs:attributeGroup>
- <xs:attributeGroup name="attlist.faces-security-events">
+ <xs:element name="remember-me">
+ <xs:complexType mixed="true">
+ <xs:attributeGroup ref="components:attlist.component"/>
+ <xs:attributeGroup ref="security:attlist.remember-me"/>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:attributeGroup name="attlist.remember-me">
<xs:attribute name="cookie-max-age" type="components:int"/>
- </xs:attributeGroup>
+ <xs:attribute name="enabled" type="components:boolean"/>
+ </xs:attributeGroup>
<xs:element name="identity-manager">
<xs:complexType mixed="true">
Added: trunk/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/components/model/handlers/RenameComponentHandler.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/components/model/handlers/RenameComponentHandler.java (rev 0)
+++ trunk/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/components/model/handlers/RenameComponentHandler.java 2009-04-23 13:12:04 UTC (rev 14870)
@@ -0,0 +1,28 @@
+package org.jboss.tools.seam.xml.components.model.handlers;
+
+import java.util.Properties;
+
+import org.jboss.tools.common.meta.action.SpecialWizard;
+import org.jboss.tools.common.meta.action.SpecialWizardFactory;
+import org.jboss.tools.common.meta.action.impl.AbstractHandler;
+import org.jboss.tools.common.model.XModelException;
+import org.jboss.tools.common.model.XModelObject;
+
+public class RenameComponentHandler extends AbstractHandler {
+
+ public RenameComponentHandler() {
+ }
+
+ public boolean isEnabled(XModelObject object) {
+ return object != null && object.isObjectEditable();
+ }
+
+ public void executeHandler(XModelObject object, Properties p) throws XModelException {
+ if(!isEnabled(object)) return;
+
+ SpecialWizard wizard = SpecialWizardFactory.createSpecialWizard("org.jboss.tools.seam.ui.views.actions.RenameComponentAction");
+ wizard.setObject(object);
+ wizard.execute();
+ }
+
+}
15 years, 8 months
- 1
- 0
JBoss Tools SVN: r14869 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2009-04-23 08:58:53 -0400 (Thu, 23 Apr 2009)
New Revision: 14869
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/RenameComponentProcessor.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-1077
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/RenameComponentProcessor.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/RenameComponentProcessor.java 2009-04-23 12:11:40 UTC (rev 14868)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/RenameComponentProcessor.java 2009-04-23 12:58:53 UTC (rev 14869)
@@ -104,7 +104,7 @@
private static final String FACTORY_NODE = "factory";
private static final String NAME_ATTRIBUTE = "name";
- private IFile file=null;
+ private IFile declarationFile=null;
private ISeamComponent component;
private String newName;
//private ISeamProject seamProject;
@@ -115,15 +115,6 @@
public RenameComponentProcessor(ISeamComponent component) {
super();
this.component = component;
-// IProject project = file.getProject();
-// ISeamProject seamProject = SeamCorePlugin.getSeamProject(project, true);
-// if (seamProject != null) {
-// Set<ISeamComponent> components = seamProject.getComponentsByPath(file.getFullPath());
-// if (components.size() > 0) {
-// // This is a component which we want to rename.
-// component = components.iterator().next();
-// }
-// }
}
public ISeamComponent getComponent() {
@@ -223,7 +214,10 @@
// we need to find references in .java .xml .xhtml .jsp .properties files
private void findELReferences(){
- SeamProjectsSet projectsSet = new SeamProjectsSet(file.getProject());
+ if(declarationFile == null)
+ return;
+
+ SeamProjectsSet projectsSet = new SeamProjectsSet(declarationFile.getProject());
IProject[] projects = projectsSet.getAllProjects();
for (int i = 0; i < projects.length; i++) {
@@ -268,7 +262,7 @@
}
if(ext.equalsIgnoreCase(JAVA_EXT)){
scanJava(file, content);
- //lookingForAnnotations(file);
+ lookingForAnnotations(file);
} else if(ext.equalsIgnoreCase(XML_EXT) || ext.equalsIgnoreCase(XHTML_EXT) || ext.equalsIgnoreCase(JSP_EXT))
scanDOM(file, content);
else if(ext.equalsIgnoreCase(PROPERTIES_EXT))
@@ -290,7 +284,7 @@
}
if(source.indexOf("\""+component.getName()+"\"") >= 0){
- changeAnnotation(annotation);
+ changeAnnotation(file, annotation);
}else if(annotation.getParent().getElementType() == IJavaElement.FIELD){
IField field = (IField)annotation.getParent();
if(memberValueNumber == 0 && field.getElementName().equals(component.getName())){
@@ -305,7 +299,7 @@
// }catch(CoreException ex){
// SeamCorePlugin.getDefault().logError(ex);
// }
- changeAnnotation(annotation);
+ changeAnnotation(file, annotation);
}
}else if(annotation.getParent().getElementType() == IJavaElement.METHOD){
IMethod method = (IMethod)annotation.getParent();
@@ -321,7 +315,7 @@
// }catch(CoreException ex){
// SeamCorePlugin.getDefault().logError(ex);
// }
- changeAnnotation(annotation);
+ changeAnnotation(file, annotation);
}
}
}
@@ -341,11 +335,17 @@
}
private void renameJavaDeclaration(ISeamJavaComponentDeclaration javaDecl) throws CoreException{
- file = (IFile)javaDecl.getResource();
- if(file != null){
- IAnnotation annotation = getNameAnnotation(file);
+ declarationFile = (IFile)javaDecl.getResource();
+ if(declarationFile != null){
+// ISeamTextSourceReference location = ((SeamComponentDeclaration)javaDecl).getLocationFor(ISeamXmlComponentDeclaration.NAME);
+// if(location != null){
+// TextFileChange change = getChange(declarationFile);
+// TextEdit edit = new ReplaceEdit(location.getStartPosition(), location.getLength(), newName);
+// change.addEdit(edit);
+// }
+ IAnnotation annotation = getNameAnnotation(declarationFile);
if(annotation != null){
- TextFileChange change = getChange(file);
+ TextFileChange change = getChange(declarationFile);
String annotationText = annotation.getSource().replace(component.getName(), newName);
@@ -356,17 +356,18 @@
}
private void renameXMLDeclaration(ISeamXmlComponentDeclaration xmlDecl){
- file = (IFile)xmlDecl.getResource();
- if(file != null){
+ declarationFile = (IFile)xmlDecl.getResource();
+ if(declarationFile != null){
ISeamTextSourceReference location = ((SeamComponentDeclaration)xmlDecl).getLocationFor(ISeamXmlComponentDeclaration.NAME);
-
- TextFileChange change = getChange(file);
- TextEdit edit = new ReplaceEdit(location.getStartPosition(), location.getLength(), newName);
- change.addEdit(edit);
+ if(location != null){
+ TextFileChange change = getChange(declarationFile);
+ TextEdit edit = new ReplaceEdit(location.getStartPosition(), location.getLength(), newName);
+ change.addEdit(edit);
+ }
}
}
- private void changeAnnotation(IAnnotation annotation){
+ private void changeAnnotation(IFile file, IAnnotation annotation){
try{
String annotationText = annotation.getSource();
//String annotationText = "@In(\""+newName+"\")";
15 years, 8 months
- 1
- 0
JBoss Tools SVN: r14868 - trunk/documentation/guides/GettingStartedGuide/en/images/manage.
by jbosstools-commits＠lists.jboss.org
Author: chukhutsina
Date: 2009-04-23 08:11:40 -0400 (Thu, 23 Apr 2009)
New Revision: 14868
Modified:
trunk/documentation/guides/GettingStartedGuide/en/images/manage/manage_17.png
Log:
https://jira.jboss.org/jira/browse/JBDS-588 - Old jboss server's view is completely replace with a new one.The Getting Started with JBoss Developer Studio guide was updated according to the new jboss server view.
Modified: trunk/documentation/guides/GettingStartedGuide/en/images/manage/manage_17.png
===================================================================
(Binary files differ)
15 years, 8 months
- 1
- 0
JBoss Tools SVN: r14867 - trunk/documentation/guides/GettingStartedGuide/en/images/manage.
by jbosstools-commits＠lists.jboss.org
Author: chukhutsina
Date: 2009-04-23 08:11:03 -0400 (Thu, 23 Apr 2009)
New Revision: 14867
Modified:
trunk/documentation/guides/GettingStartedGuide/en/images/manage/manage_6.png
Log:
https://jira.jboss.org/jira/browse/JBDS-588 - Old jboss server's view is completely replace with a new one.The Getting Started with JBoss Developer Studio guide was updated according to the new jboss server view.
Modified: trunk/documentation/guides/GettingStartedGuide/en/images/manage/manage_6.png
===================================================================
(Binary files differ)
15 years, 8 months
- 1
- 0
JBoss Tools SVN: r14866 - trunk/documentation/guides/GettingStartedGuide/en/images/manage.
by jbosstools-commits＠lists.jboss.org
Author: chukhutsina
Date: 2009-04-23 08:10:50 -0400 (Thu, 23 Apr 2009)
New Revision: 14866
Modified:
trunk/documentation/guides/GettingStartedGuide/en/images/manage/manage_4.png
Log:
https://jira.jboss.org/jira/browse/JBDS-588 - Old jboss server's view is completely replace with a new one.The Getting Started with JBoss Developer Studio guide was updated according to the new jboss server view.
Modified: trunk/documentation/guides/GettingStartedGuide/en/images/manage/manage_4.png
===================================================================
(Binary files differ)
15 years, 8 months
- 1
- 0
JBoss Tools SVN: r14865 - trunk/documentation/guides/GettingStartedGuide/en/images/manage.
by jbosstools-commits＠lists.jboss.org
Author: chukhutsina
Date: 2009-04-23 08:10:21 -0400 (Thu, 23 Apr 2009)
New Revision: 14865
Modified:
trunk/documentation/guides/GettingStartedGuide/en/images/manage/manage_1.png
Log:
https://jira.jboss.org/jira/browse/JBDS-588 - Old jboss server's view is completely replace with a new one.The Getting Started with JBoss Developer Studio guide was updated according to the new jboss server view.
Modified: trunk/documentation/guides/GettingStartedGuide/en/images/manage/manage_1.png
===================================================================
(Binary files differ)
15 years, 8 months
- 1
- 0