[lang][ui] Change SARL package if reference update argument is checked.

see #444 Signed-off-by: Stéphane Galland <galland@arakhne.org>
sarl · Aug 12, 2016 · 00977b2 · 00977b2
1 parent 7a177f3
commit 00977b2
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 27 deletions.
diff --git a/...ins/io.sarl.lang.ui/src/io/sarl/lang/ui/refactoring/rename/SARLFileRenameParticipant.java b/...ins/io.sarl.lang.ui/src/io/sarl/lang/ui/refactoring/rename/SARLFileRenameParticipant.java
@@ -73,6 +73,9 @@ public SARLFileRenameParticipant(@Named(Constants.FILE_EXTENSIONS) String fileEx
 
 	@Override
 	protected List<? extends IRenameElementContext> createRenameElementContexts(Object element) {
+		if (!getArguments().getUpdateReferences()) {
+			return super.createRenameElementContexts(element);
+		}
 		assert element instanceof IFile;
 		final IFile file = (IFile) element;
 		final IPath filePath = file.getFullPath();

diff --git a/.../io.sarl.lang.ui/src/io/sarl/lang/ui/refactoring/rename/SARLPackageRenameParticipant.java b/.../io.sarl.lang.ui/src/io/sarl/lang/ui/refactoring/rename/SARLPackageRenameParticipant.java
@@ -89,26 +89,28 @@ protected List<? extends IRenameElementContext> createRenameElementContexts(Obje
 		assert element instanceof IPackageFragment;
 		final IPackageFragment packageFragment = (IPackageFragment) element;
 		final List<IRenameElementContext> contexts = new ArrayList<>();
-		try {
-			final ResourceSet resourceSet = this.resourceSetProvider.get(packageFragment.getJavaProject().getProject());
-			final String oldPackageName = packageFragment.getElementName();
-			final String[] oldPackageNameElements = oldPackageName.split(PACKAGE_SEPARATOR_PATTERN);
-			final String newPackageName = getNewName();
-			final String[] newPackageNameElements = newPackageName.split(PACKAGE_SEPARATOR_PATTERN);
-			for (final Object resourceObject : packageFragment.getNonJavaResources()) {
-				if (resourceObject instanceof IFile) {
-					final IFile file = (IFile) resourceObject;
-					if (file.getName().endsWith(this.fileExtension)) {
-						final IPath filePath = file.getFullPath();
-						final URI resourceURI = URI.createPlatformResourceURI(filePath.toString(), true);
-						final Resource resource = resourceSet.getResource(resourceURI, true);
-						createPackageRenameContext(oldPackageName, newPackageName, filePath,
-								resource, contexts, oldPackageNameElements.length, newPackageNameElements);
+		if (getArguments().getUpdateReferences()) {
+			try {
+				final ResourceSet resourceSet = this.resourceSetProvider.get(packageFragment.getJavaProject().getProject());
+				final String oldPackageName = packageFragment.getElementName();
+				final String[] oldPackageNameElements = oldPackageName.split(PACKAGE_SEPARATOR_PATTERN);
+				final String newPackageName = getNewName();
+				final String[] newPackageNameElements = newPackageName.split(PACKAGE_SEPARATOR_PATTERN);
+				for (final Object resourceObject : packageFragment.getNonJavaResources()) {
+					if (resourceObject instanceof IFile) {
+						final IFile file = (IFile) resourceObject;
+						if (file.getName().endsWith(this.fileExtension)) {
+							final IPath filePath = file.getFullPath();
+							final URI resourceURI = URI.createPlatformResourceURI(filePath.toString(), true);
+							final Resource resource = resourceSet.getResource(resourceURI, true);
+							createPackageRenameContext(oldPackageName, newPackageName, filePath,
+									resource, contexts, oldPackageNameElements.length, newPackageNameElements);
+						}
 					}
 				}
+			} catch (JavaModelException exception) {
+				getStatus().add(RefactoringStatus.ERROR, exception.getLocalizedMessage(), exception, LOG);
 			}
-		} catch (JavaModelException exception) {
-			getStatus().add(RefactoringStatus.ERROR, exception.getLocalizedMessage(), exception, LOG);
 		}
 		if (contexts.isEmpty()) {
 			return super.createRenameElementContexts(packageFragment);

diff --git a/...io.sarl.lang.ui.tests/src/io/sarl/lang/ui/tests/contentassist/ClassContentAssistTest.java b/...io.sarl.lang.ui.tests/src/io/sarl/lang/ui/tests/contentassist/ClassContentAssistTest.java
@@ -66,16 +66,6 @@ public void afterImplements() throws Exception {
 			newBuilder().append("implements").assertText("implements");
 		}
 
-		@Test
-		public void afterExtendsSpace() throws Exception {
-			newBuilder().append("extends ").assertCount(2861);
-		}
-
-		@Test
-		public void afterImplementsSpace() throws Exception {
-			newBuilder().append("implements ").assertCount(1383);
-		}
-
 		@Test
 		public void startBlock() throws Exception {
 			assertTextInsideProposals(newBuilder().append("{ "),