svatoun commented on a change in pull request #361: my first refactoring session
URL: https://github.com/apache/incubator-netbeans/pull/361#discussion_r161169550
##########
File path:
refactoring.api/src/org/netbeans/modules/refactoring/api/RefactoringSession.java
##########
@@ -116,79 +108,66 @@ private Problem reallyDoRefactoring(boolean
saveAfterDone) {
try {
while (it.hasNext()) {
RefactoringElementImplementation element =
(RefactoringElementImplementation) it.next();
- if (element.isEnabled() && !((element.getStatus() ==
RefactoringElement.GUARDED) || (element.getStatus() ==
RefactoringElement.READ_ONLY))) {
- element.performChange();
- }
+ changeRefactoringElement(element, true);
current += progressStep;
fireProgressListenerStep((int) current);
}
} finally {
- for (Transaction commit : commits) {
- SPIAccessor.DEFAULT.check(commit, false);
- }
-
- UndoableWrapper wrapper =
MimeLookup.getLookup("").lookup(UndoableWrapper.class);
- for (Transaction commit : commits) {
- if (wrapper != null) {
- setWrappers(commit, wrapper);
+ commits.forEach(commit -> SPIAccessor.DEFAULT.check(commit,
false));
+ UndoableWrapper undoableWrapper =
MimeLookup.getLookup("").lookup(UndoableWrapper.class);
+ commits.forEach(commit -> {
+ if (undoableWrapper != null) {
+ undoableWrapper.setActive(true, this);
}
-
- if(commit instanceof ProgressProvider) {
+ if (commit instanceof ProgressProvider) {
ProgressProvider progressProvider = (ProgressProvider)
commit;
progressProvider.addProgressListener(progressListener);
- }
- try {
- commit.commit();
- } finally {
- if(commit instanceof ProgressProvider) {
- ProgressProvider progressProvider =
(ProgressProvider) commit;
+ try {
+ commit.commit();
+ } finally {
progressProvider.removeProgressListener(progressListener);
}
+ } else {
+ commit.commit();
}
- if (wrapper != null) {
- unsetWrappers(commit, wrapper);
+ if (undoableWrapper != null) {
+ undoableWrapper.setActive(false, null);
}
+ });
+ if (undoableWrapper != null) {
+ undoableWrapper.close();
}
- if (wrapper != null) {
- wrapper.close();
- }
- for (Transaction commit : commits) {
- SPIAccessor.DEFAULT.sum(commit);
- }
+ commits.forEach(commit -> SPIAccessor.DEFAULT.sum(commit));
}
if (saveAfterDone) {
LifecycleManager.getDefault().saveAll();
- for (DataObject dob:DataObject.getRegistry().getModified()) {
- SaveCookie cookie = dob.getCookie(SaveCookie.class);
+ for (DataObject dataObject :
DataObject.getRegistry().getModified()) {
+ SaveCookie cookie =
dataObject.getLookup().lookup(SaveCookie.class);
try {
cookie.save();
} catch (IOException ex) {
Exceptions.printStackTrace(ex);
}
}
}
- for (RefactoringElementImplementation
fileChange:SPIAccessor.DEFAULT.getFileChanges(bag)) {
- if (fileChange.isEnabled()) {
- fileChange.performChange();
- }
- }
+ SPIAccessor.DEFAULT.getFileChanges(bag).stream().filter(fileChange
-> fileChange.isEnabled()).forEachOrdered(fileChange ->
fileChange.performChange());
fireProgressListenerStep();
} finally {
fireProgressListenerStop();
if (realcommit) {
undoManager.addItem(this);
undoManager.transactionEnded(false, this);
- realcommit=false;
+ realcommit = false;
}
}
Logger timer = Logger.getLogger("TIMER.RefactoringSession");
if (timer.isLoggable(Level.FINE)) {
- time = System.currentTimeMillis() - time;
- timer.log(Level.FINE, "refactoringSession.doRefactoring", new
Object[] { description, RefactoringSession.this, time } );
+ final long timeTaken = System.currentTimeMillis() - start;
+ timer.log(Level.FINE, "refactoringSession.doRefactoring", new
Object[]{description, RefactoringSession.this, timeTaken});
Review comment:
Considering most of the PR fixes whitespaces, there should be whitespaces
before/after { to separate from type and array content, and before }.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
