Draft: Refactoring improvement and EMFComprare previews for renamings #131
Conversation
| final InstanceSearch structMemberSearch = StructDataTypeSearch | ||
| .createStructMemberSearch((StructuredType) oldTypeEntry.getTypeEditable()); | ||
|
|
||
| final Set<INamedElement> search = InstanceSearch.performProjectSearch(this.file.getProject(), |
There was a problem hiding this comment.
please use the new search:
org.eclipse.fordiac.ide.model.search.types.BlockTypeInstanceSearch
or
org.eclipse.fordiac.ide.model.search.types.DataTypeInstanceSearch
The old one is not working, they are deprecated and will be removed in the future
There was a problem hiding this comment.
With the new search you will hopefully can delete lin 68-73
...ent/src/org/eclipse/fordiac/ide/typemanagement/refactoring/UpdateTypeLibraryEntryChange.java
Outdated
Show resolved
Hide resolved
| } | ||
|
|
||
| private List<FBNetworkElement> searchAffectedStructuredType() { | ||
| final InstanceSearch structMemberSearch = StructDataTypeSearch |
There was a problem hiding this comment.
Also here you can use the new search
| } | ||
|
|
||
| private List<FBType> searchAffectedFBs() { | ||
| final InstanceSearch search = StructDataTypeSearch |
| @@ -0,0 +1,76 @@ | |||
| package org.eclipse.fordiac.ide.typemanagement.refactoring.rename; | |||
There was a problem hiding this comment.
Please make sure to add/update the mandatory copyright-header (taking this file as example, applies to all .java-files)
In eclipse-4diac#131 the memset was removed, this results in random values showing up on the event counters
| @@ -19,17 +19,10 @@ Require-Bundle: org.eclipse.core.runtime, | |||
| org.eclipse.ltk.ui.refactoring, | |||
| org.eclipse.fordiac.ide.model.search, | |||
| org.eclipse.fordiac.ide.model.commands, | |||
| <<<<<<< HEAD | |||
There was a problem hiding this comment.
Here are merge conflicts that did not get resolved automatically
| @@ -72,12 +72,8 @@ RenameElementRefactoringProcessor_Name=Rename element to {0} | |||
| RenameElementRefactoringProcessor_RenamePinInType=Rename Pin in type: {0} | |||
| RenameElementRefactoringWizardPage_Name=Name | |||
| RenameType_Name=Rename IEC 61499 Type | |||
| <<<<<<< HEAD | |||
There was a problem hiding this comment.
Here are merge conflicts that did not get resolved automatically
This change updates the rename refactoring preview to add more logical grouping and replaces searches with the new search implementation. An EMFcompare preview is also included for structs and FBs, however this will cause a crash when viewing multiple changes - hence this MR in DRAFT state. See https://www.eclipse.org/forums/index.php/t/1115097/ for more information regarding the exception caused by an EMFcompare internal bug.