>();
diff --git a/platform/platform-resources-en/src/tips/SearchInSettings.html b/platform/platform-resources-en/src/tips/SearchInSettings.html
index b9a158bd277a..2858bdfdc42e 100644
--- a/platform/platform-resources-en/src/tips/SearchInSettings.html
+++ b/platform/platform-resources-en/src/tips/SearchInSettings.html
@@ -5,7 +5,7 @@
| You can quickly find a setting you need in the Settings dialog, without browsing through the numerous options.
Just type some characters that to your opinion exist in the option description, and the list of settings will reduce to the
matching ones. Select the desired entry, and see the setting that contains the entered characters highlighted:
- 
+ 
|
diff --git a/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java b/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java
index 4679f4bf0eb2..d38a17eb4605 100644
--- a/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java
+++ b/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java
@@ -25,7 +25,10 @@ import com.intellij.codeInsight.completion.CompletionType;
import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer;
import com.intellij.codeInsight.daemon.DaemonCodeAnalyzerSettings;
import com.intellij.codeInsight.daemon.HighlightDisplayKey;
-import com.intellij.codeInsight.daemon.impl.*;
+import com.intellij.codeInsight.daemon.impl.DaemonCodeAnalyzerImpl;
+import com.intellij.codeInsight.daemon.impl.HighlightInfo;
+import com.intellij.codeInsight.daemon.impl.HighlightInfoType;
+import com.intellij.codeInsight.daemon.impl.ShowIntentionsPass;
import com.intellij.codeInsight.folding.impl.CodeFoldingManagerImpl;
import com.intellij.codeInsight.highlighting.actions.HighlightUsagesAction;
import com.intellij.codeInsight.intention.IntentionAction;
@@ -70,7 +73,7 @@ import com.intellij.openapi.fileTypes.FileType;
import com.intellij.openapi.fileTypes.FileTypeManager;
import com.intellij.openapi.fileTypes.StdFileTypes;
import com.intellij.openapi.module.Module;
-import com.intellij.openapi.project.DumbServiceImpl;
+import com.intellij.openapi.project.DumbService;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.*;
import com.intellij.openapi.util.io.FileUtil;
@@ -1307,9 +1310,10 @@ public class CodeInsightTestFixtureImpl extends BaseFixture implements CodeInsig
}
public static void ensureIndexesUpToDate(Project project) {
- FileBasedIndex.getInstance().ensureUpToDate(StubUpdatingIndex.INDEX_ID, project, null);
- FileBasedIndex.getInstance().ensureUpToDate(TodoIndex.NAME, project, null);
- assertTrue(!DumbServiceImpl.getInstance(project).isDumb());
+ if (!DumbService.isDumb(project)) {
+ FileBasedIndex.getInstance().ensureUpToDate(StubUpdatingIndex.INDEX_ID, project, null);
+ FileBasedIndex.getInstance().ensureUpToDate(TodoIndex.NAME, project, null);
+ }
}
@Override
diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/AbstractVcs.java b/platform/vcs-api/src/com/intellij/openapi/vcs/AbstractVcs.java
index a23bd2747fc5..5e735f8dd554 100644
--- a/platform/vcs-api/src/com/intellij/openapi/vcs/AbstractVcs.java
+++ b/platform/vcs-api/src/com/intellij/openapi/vcs/AbstractVcs.java
@@ -32,6 +32,7 @@ import com.intellij.openapi.vcs.diff.RevisionSelector;
import com.intellij.openapi.vcs.history.VcsFileRevision;
import com.intellij.openapi.vcs.history.VcsHistoryProvider;
import com.intellij.openapi.vcs.history.VcsRevisionNumber;
+import com.intellij.openapi.vcs.impl.IllegalStateProxy;
import com.intellij.openapi.vcs.merge.MergeProvider;
import com.intellij.openapi.vcs.rollback.RollbackEnvironment;
import com.intellij.openapi.vcs.update.UpdateEnvironment;
@@ -61,6 +62,10 @@ public abstract class AbstractVcs extends S
private VcsShowSettingOption myUpdateOption;
private VcsShowSettingOption myStatusOption;
+ private CheckinEnvironment myCheckinEnvironment;
+ private UpdateEnvironment myUpdateEnvironment;
+ private RollbackEnvironment myRollbackEnvironment;
+
public AbstractVcs(final Project project, final String name) {
super(project);
@@ -124,23 +129,43 @@ public abstract class AbstractVcs extends S
}
/**
+ * creates the object for performing checkin / commit / submit operations.
+ */
+ @Nullable
+ protected CheckinEnvironment createCheckinEnvironment() {
+ return IllegalStateProxy.create(CheckinEnvironment.class);
+ }
+
+ /**
+ * !!! concrete VCS should define {@link #createCheckinEnvironment} method
+ * this method wraps created environment with a listener
+ *
* Returns the interface for performing checkin / commit / submit operations.
*
* @return the checkin interface, or null if checkins are not supported by the VCS.
*/
@Nullable
public CheckinEnvironment getCheckinEnvironment() {
- return null;
+ return myCheckinEnvironment;
}
/**
* Returns the interface for performing revert / rollback operations.
+ */
+ @Nullable
+ protected RollbackEnvironment createRollbackEnvironment() {
+ return IllegalStateProxy.create(RollbackEnvironment.class);
+ }
+
+ /**
+ * !!! concrete VCS should define {@link #createRollbackEnvironment()} method
+ * this method wraps created environment with a listener
*
* @return the rollback interface, or null if rollbacks are not supported by the VCS.
*/
@Nullable
public RollbackEnvironment getRollbackEnvironment() {
- return null;
+ return myRollbackEnvironment;
}
@Nullable
@@ -159,12 +184,21 @@ public abstract class AbstractVcs extends S
/**
* Returns the interface for performing update/sync operations.
+ */
+ @Nullable
+ protected UpdateEnvironment createUpdateEnvironment() {
+ return IllegalStateProxy.create(UpdateEnvironment.class);
+ }
+
+ /**
+ * !!! concrete VCS should define {@link #createUpdateEnvironment()} method
+ * this method wraps created environment with a listener
*
* @return the update interface, or null if the updates are not supported by the VCS.
*/
@Nullable
public UpdateEnvironment getUpdateEnvironment() {
- return null;
+ return myUpdateEnvironment;
}
/**
@@ -494,5 +528,20 @@ public abstract class AbstractVcs extends S
@CalledInAwt
public void generalPreConfigurationStep() {
}
+
+ public void setCheckinEnvironment(CheckinEnvironment checkinEnvironment) {
+ if (myCheckinEnvironment != null) throw new IllegalStateException("Attempt to redefine checkin environment");
+ myCheckinEnvironment = checkinEnvironment;
+ }
+
+ public void setUpdateEnvironment(UpdateEnvironment updateEnvironment) {
+ if (myUpdateEnvironment != null) throw new IllegalStateException("Attempt to redefine update environment");
+ myUpdateEnvironment = updateEnvironment;
+ }
+
+ public void setRollbackEnvironment(RollbackEnvironment rollbackEnvironment) {
+ if (myRollbackEnvironment != null) throw new IllegalStateException("Attempt to redefine rollback environment");
+ myRollbackEnvironment = rollbackEnvironment;
+ }
}
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/telemetry/InspectionRunListener.java b/platform/vcs-api/src/com/intellij/openapi/vcs/ForwardingListener.java
similarity index 52%
rename from plugins/InspectionGadgets/src/com/siyeh/ig/telemetry/InspectionRunListener.java
rename to platform/vcs-api/src/com/intellij/openapi/vcs/ForwardingListener.java
index 6356215b623e..120111989b12 100644
--- a/plugins/InspectionGadgets/src/com/siyeh/ig/telemetry/InspectionRunListener.java
+++ b/platform/vcs-api/src/com/intellij/openapi/vcs/ForwardingListener.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2003-2010 Dave Griffith, Bas Leijdekkers
+ * Copyright 2000-2010 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,9 +13,25 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.siyeh.ig.telemetry;
+package com.intellij.openapi.vcs;
-public interface InspectionRunListener{
-
- void reportRun(String inspectionID, long runTime);
+import com.intellij.openapi.util.Pair;
+import com.intellij.util.Consumer;
+
+/**
+* @author irengrig
+* Date: 12/21/10
+* Time: 2:15 PM
+*/
+public class ForwardingListener implements Consumer>> {
+ private final T myT;
+
+ public ForwardingListener(T t) {
+ myT = t;
+ }
+
+ @Override
+ public void consume(Pair> vcsKeyConsumerPair) {
+ vcsKeyConsumerPair.getSecond().consume(myT);
+ }
}
diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/ProjectLevelVcsManager.java b/platform/vcs-api/src/com/intellij/openapi/vcs/ProjectLevelVcsManager.java
index f85e747459de..2218aa571c56 100644
--- a/platform/vcs-api/src/com/intellij/openapi/vcs/ProjectLevelVcsManager.java
+++ b/platform/vcs-api/src/com/intellij/openapi/vcs/ProjectLevelVcsManager.java
@@ -23,6 +23,7 @@ import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Computable;
import com.intellij.openapi.vcs.checkin.CheckinHandlerFactory;
import com.intellij.openapi.vcs.impl.VcsDescriptor;
+import com.intellij.openapi.vcs.impl.VcsEnvironmentsProxyCreator;
import com.intellij.openapi.vcs.update.UpdatedFiles;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.util.Processor;
@@ -275,4 +276,7 @@ public abstract class ProjectLevelVcsManager {
public abstract CheckoutProvider.Listener getCompositeCheckoutListener();
public static Topic VCS_CONFIGURATION_CHANGED = Topic.create("VCS configuration changed", VcsListener.class);
+
+ public abstract VcsEventsListenerManager getVcsEventsListenerManager();
+ protected abstract VcsEnvironmentsProxyCreator getProxyCreator();
}
diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/VcsActiveEnvironmentsProxy.java b/platform/vcs-api/src/com/intellij/openapi/vcs/VcsActiveEnvironmentsProxy.java
new file mode 100644
index 000000000000..c031ea0bf8b1
--- /dev/null
+++ b/platform/vcs-api/src/com/intellij/openapi/vcs/VcsActiveEnvironmentsProxy.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2000-2010 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.openapi.vcs;
+
+import com.intellij.openapi.vcs.checkin.CheckinEnvironment;
+import com.intellij.openapi.vcs.impl.IllegalStateProxy;
+import com.intellij.openapi.vcs.impl.VcsEnvironmentsProxyCreator;
+import com.intellij.openapi.vcs.rollback.RollbackEnvironment;
+import com.intellij.openapi.vcs.update.UpdateEnvironment;
+
+/**
+ * @author irengrig
+ * Date: 12/17/10
+ * Time: 12:46 PM
+ */
+public class VcsActiveEnvironmentsProxy {
+ private VcsActiveEnvironmentsProxy() {
+ }
+
+ public static AbstractVcs proxyVcs(final AbstractVcs vcs) {
+ final ProjectLevelVcsManager manager = ProjectLevelVcsManager.getInstance(vcs.getProject());
+ final VcsEnvironmentsProxyCreator proxyCreator = manager.getProxyCreator();
+ if (proxyCreator == null) return vcs;
+
+ final VcsKey key = vcs.getKeyInstanceMethod();
+ final CheckinEnvironment checkinEnvironment = vcs.createCheckinEnvironment();
+ final UpdateEnvironment updateEnvironment = vcs.createUpdateEnvironment();
+ final RollbackEnvironment rollbackEnvironment = vcs.createRollbackEnvironment();
+
+ if (checkinEnvironment != null && checkinEnvironment.equals(IllegalStateProxy.IDENTITY) ||
+ updateEnvironment != null && updateEnvironment.equals(IllegalStateProxy.IDENTITY) ||
+ rollbackEnvironment != null && rollbackEnvironment.equals(IllegalStateProxy.IDENTITY)) {
+ return vcs;
+ } else {
+ final CheckinEnvironment proxedCheckin = proxyCreator.proxyCheckin(key, checkinEnvironment);
+ final UpdateEnvironment proxedUpdate = proxyCreator.proxyUpdate(key, updateEnvironment);
+ final RollbackEnvironment proxedRollback = proxyCreator.proxyRollback(key, rollbackEnvironment);
+ vcs.setCheckinEnvironment(proxedCheckin);
+ vcs.setUpdateEnvironment(proxedUpdate);
+ vcs.setRollbackEnvironment(proxedRollback);
+ return vcs;
+ }
+ }
+}
diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/VcsEventsListenerManager.java b/platform/vcs-api/src/com/intellij/openapi/vcs/VcsEventsListenerManager.java
new file mode 100644
index 000000000000..562625a814df
--- /dev/null
+++ b/platform/vcs-api/src/com/intellij/openapi/vcs/VcsEventsListenerManager.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2000-2010 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.openapi.vcs;
+
+import com.intellij.openapi.util.Pair;
+import com.intellij.openapi.vcs.checkin.CheckinEnvironment;
+import com.intellij.openapi.vcs.rollback.RollbackEnvironment;
+import com.intellij.openapi.vcs.update.UpdateEnvironment;
+import com.intellij.util.Consumer;
+
+/**
+ * @author irengrig
+ * Date: 12/15/10
+ * Time: 5:42 PM
+ */
+public interface VcsEventsListenerManager {
+ void removeCheckin(final Object key);
+ void removeUpdate(final Object key);
+ void removeRollback(final Object key);
+
+ Object addCheckin(Consumer>> consumer);
+ Object addUpdate(Consumer>> consumer);
+ Object addRollback(Consumer>> consumer);
+}
diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/impl/IllegalStateProxy.java b/platform/vcs-api/src/com/intellij/openapi/vcs/impl/IllegalStateProxy.java
new file mode 100644
index 000000000000..e4ecd49463f8
--- /dev/null
+++ b/platform/vcs-api/src/com/intellij/openapi/vcs/impl/IllegalStateProxy.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2000-2010 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.openapi.vcs.impl;
+
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+
+/**
+ * @author irengrig
+ * Date: 12/17/10
+ * Time: 2:21 PM
+ */
+public class IllegalStateProxy {
+ public static final Object IDENTITY = new Object();
+
+ private static final InvocationHandler HANDLER = new InvocationHandler() {
+ @Override
+ public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+ if ("equals".equals(method.getName())) {
+ return IDENTITY.equals(args[0]);
+ }
+ throw new IllegalStateException();
+ }
+ };
+
+ private IllegalStateProxy() {
+ }
+
+ public static T create(final Class clazz) {
+ return (T) Proxy.newProxyInstance(clazz.getClassLoader(), new Class[]{clazz}, HANDLER);
+ }
+}
diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/impl/VcsEnvironmentsProxyCreator.java b/platform/vcs-api/src/com/intellij/openapi/vcs/impl/VcsEnvironmentsProxyCreator.java
new file mode 100644
index 000000000000..eea5ff2dde86
--- /dev/null
+++ b/platform/vcs-api/src/com/intellij/openapi/vcs/impl/VcsEnvironmentsProxyCreator.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2000-2010 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.openapi.vcs.impl;
+
+import com.intellij.openapi.vcs.VcsKey;
+import com.intellij.openapi.vcs.checkin.CheckinEnvironment;
+import com.intellij.openapi.vcs.rollback.RollbackEnvironment;
+import com.intellij.openapi.vcs.update.UpdateEnvironment;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * @author irengrig
+ * Date: 12/17/10
+ * Time: 5:34 PM
+ */
+public interface VcsEnvironmentsProxyCreator {
+ @Nullable
+ CheckinEnvironment proxyCheckin(VcsKey key, CheckinEnvironment environment);
+
+ @Nullable
+ UpdateEnvironment proxyUpdate(VcsKey key, UpdateEnvironment environment);
+
+ @Nullable
+ RollbackEnvironment proxyRollback(VcsKey key, RollbackEnvironment environment);
+}
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListWorker.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListWorker.java
index 1a16670fa137..1d6e08c8209e 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListWorker.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListWorker.java
@@ -232,7 +232,7 @@ public class ChangeListWorker implements ChangeListsWriteOperations {
}
public boolean addChangeToList(@NotNull final String name, final Change change, final VcsKey vcsKey) {
- LOG.debug("[addChangeToList] name: " + name + " change: " + ChangesUtil.getFilePath(change).getPath() + " vcs: " +
+ LOG.info("[addChangeToList] name: " + name + " change: " + ChangesUtil.getFilePath(change).getPath() + " vcs: " +
(vcsKey == null ? null : vcsKey.getName()));
final LocalChangeList changeList = myMap.get(name);
if (changeList != null) {
@@ -243,16 +243,16 @@ public class ChangeListWorker implements ChangeListsWriteOperations {
}
public void addChangeToCorrespondingList(final Change change, final VcsKey vcsKey) {
- final String path = LOG.isDebugEnabled() ? ChangesUtil.getFilePath(change).getPath() : "";
- LOG.debug("[addChangeToCorrespondingList] for change " + path + " type: " + change.getType() + " have before revision: " + (change.getBeforeRevision() != null));
+ final String path = ChangesUtil.getFilePath(change).getPath();
+ LOG.info("[addChangeToCorrespondingList] for change " + path + " type: " + change.getType() + " have before revision: " + (change.getBeforeRevision() != null));
assert myDefault != null;
for (LocalChangeList list : myMap.values()) {
if (list.isDefault()) {
- LOG.debug("[addChangeToCorrespondingList] skip default list: " + list.getName() + " type: " + change.getType() + " have before revision: " + (change.getBeforeRevision() != null));
+ LOG.info("[addChangeToCorrespondingList] skip default list: " + list.getName() + " type: " + change.getType() + " have before revision: " + (change.getBeforeRevision() != null));
continue;
}
if (((LocalChangeListImpl) list).processChange(change)) {
- LOG.debug("[addChangeToCorrespondingList] matched: " + list.getName() + " type: " + change.getType() + " have before revision: " + (change.getBeforeRevision() != null));
+ LOG.info("[addChangeToCorrespondingList] matched: " + list.getName() + " type: " + change.getType() + " have before revision: " + (change.getBeforeRevision() != null));
myIdx.changeAdded(change, vcsKey);
return;
}
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/UpdatingChangeListBuilder.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/UpdatingChangeListBuilder.java
index 1cfc7eea25e4..933e45d00b28 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/UpdatingChangeListBuilder.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/UpdatingChangeListBuilder.java
@@ -66,11 +66,11 @@ class UpdatingChangeListBuilder implements ChangelistBuilder {
public void processChangeInList(final Change change, @Nullable final ChangeList changeList, final VcsKey vcsKey) {
checkIfDisposed();
- LOG.debug("[processChangeInList-1] entering, cl name: " + ((changeList == null) ? null: changeList.getName()) +
+ LOG.info("[processChangeInList-1] entering, cl name: " + ((changeList == null) ? null: changeList.getName()) +
" change: " + ChangesUtil.getFilePath(change).getPath());
final String fileName = ChangesUtil.getFilePath(change).getName();
if (FileTypeManager.getInstance().isFileIgnored(fileName)) {
- LOG.debug("[processChangeInList-1] file type ignored");
+ LOG.info("[processChangeInList-1] file type ignored");
return;
}
@@ -78,14 +78,14 @@ class UpdatingChangeListBuilder implements ChangelistBuilder {
public void run() {
if (ChangeListManagerImpl.isUnder(change, myScope)) {
if (changeList != null) {
- LOG.debug("[processChangeInList-1] to add change to cl");
+ LOG.info("[processChangeInList-1] to add change to cl");
myChangeListWorker.addChangeToList(changeList.getName(), change, vcsKey);
} else {
- LOG.debug("[processChangeInList-1] to add to corresponding list");
+ LOG.info("[processChangeInList-1] to add to corresponding list");
myChangeListWorker.addChangeToCorrespondingList(change, vcsKey);
}
} else {
- LOG.debug("[processChangeInList-1] not under scope");
+ LOG.info("[processChangeInList-1] not under scope");
}
}
});
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/ex/ProjectLevelVcsManagerEx.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/ex/ProjectLevelVcsManagerEx.java
index 88a13a480b15..345dd7a69631 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/ex/ProjectLevelVcsManagerEx.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/ex/ProjectLevelVcsManagerEx.java
@@ -50,4 +50,4 @@ public abstract class ProjectLevelVcsManagerEx extends ProjectLevelVcsManager {
public abstract void fireDirectoryMappingsChanged();
public abstract String haveDefaultMapping();
-}
\ No newline at end of file
+}
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/ProjectLevelVcsManagerImpl.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/ProjectLevelVcsManagerImpl.java
index ee3866ea4bd3..3ec1fd720d1b 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/ProjectLevelVcsManagerImpl.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/ProjectLevelVcsManagerImpl.java
@@ -53,7 +53,6 @@ import com.intellij.ui.content.Content;
import com.intellij.ui.content.ContentFactory;
import com.intellij.ui.content.ContentManager;
import com.intellij.util.ContentsUtil;
-import com.intellij.util.EventDispatcher;
import com.intellij.util.Icons;
import com.intellij.util.Processor;
import com.intellij.util.containers.Convertor;
@@ -105,6 +104,7 @@ public class ProjectLevelVcsManagerImpl extends ProjectLevelVcsManagerEx impleme
private final Map myBackgroundableActionHandlerMap;
private final List> myPendingOutput = new ArrayList>();
+ private VcsEventsListenerManagerImpl myVcsEventListenerManager;
public ProjectLevelVcsManagerImpl(Project project, final FileStatusManager manager, MessageBus messageBus) {
myProject = project;
@@ -118,6 +118,10 @@ public class ProjectLevelVcsManagerImpl extends ProjectLevelVcsManagerEx impleme
myInitialization = new VcsInitialization(myProject);
myMappings = new NewMappings(myProject, myMessageBus, this, manager);
myMappingsToRoots = new MappingsToRoots(myMappings, myProject);
+
+ if (! myProject.isDefault()) {
+ myVcsEventListenerManager = new VcsEventsListenerManagerImpl();
+ }
}
public void initComponent() {
@@ -660,6 +664,11 @@ public void addMessageToConsoleWindow(final String message, final TextAttributes
return new CompositeCheckoutListener(myProject);
}
+ @Override
+ public VcsEventsListenerManager getVcsEventsListenerManager() {
+ return myVcsEventListenerManager;
+ }
+
public void fireDirectoryMappingsChanged() {
if (myProject.isOpen() && (! myProject.isDisposed())) {
myMappings.mappingsChanged();
@@ -670,6 +679,11 @@ public void addMessageToConsoleWindow(final String message, final TextAttributes
return myMappings.haveDefaultMapping();
}
+ @Override
+ protected VcsEnvironmentsProxyCreator getProxyCreator() {
+ return myVcsEventListenerManager;
+ }
+
public BackgroundableActionEnabledHandler getBackgroundableActionHandler(final VcsBackgroundableActions action) {
ApplicationManager.getApplication().assertIsDispatchThread();
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/VcsEP.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/VcsEP.java
index e20cd188f0e5..3e7a18770404 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/VcsEP.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/VcsEP.java
@@ -23,6 +23,7 @@ import com.intellij.openapi.extensions.AbstractExtensionPointBean;
import com.intellij.openapi.extensions.ExtensionPointName;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.vcs.AbstractVcs;
+import com.intellij.openapi.vcs.VcsActiveEnvironmentsProxy;
import com.intellij.util.xmlb.annotations.Attribute;
/**
@@ -56,7 +57,7 @@ public class VcsEP extends AbstractExtensionPointBean {
return myVcs;
}
}
- myVcs = instantiate(vcsClass, project.getPicoContainer());
+ myVcs = VcsActiveEnvironmentsProxy.proxyVcs((AbstractVcs)instantiate(vcsClass, project.getPicoContainer()));
}
catch(Exception e) {
LOG.error(e);
@@ -69,4 +70,4 @@ public class VcsEP extends AbstractExtensionPointBean {
public VcsDescriptor createDescriptor() {
return new VcsDescriptor(administrativeAreaName, displayName, name);
}
-}
\ No newline at end of file
+}
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/VcsEventsListenerManagerImpl.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/VcsEventsListenerManagerImpl.java
new file mode 100644
index 000000000000..b60861caa698
--- /dev/null
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/VcsEventsListenerManagerImpl.java
@@ -0,0 +1,197 @@
+/*
+ * Copyright 2000-2010 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.openapi.vcs.impl;
+
+import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.util.Pair;
+import com.intellij.openapi.vcs.VcsEventsListenerManager;
+import com.intellij.openapi.vcs.VcsKey;
+import com.intellij.openapi.vcs.checkin.CheckinEnvironment;
+import com.intellij.openapi.vcs.rollback.RollbackEnvironment;
+import com.intellij.openapi.vcs.update.UpdateEnvironment;
+import com.intellij.util.Consumer;
+import com.intellij.util.EventDispatcher;
+import org.jetbrains.annotations.Nullable;
+
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.util.Collections;
+import java.util.EventListener;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author irengrig
+ * Date: 12/15/10
+ * Time: 5:50 PM
+ */
+public class VcsEventsListenerManagerImpl implements VcsEventsListenerManager, VcsEnvironmentsProxyCreator {
+ private final Wrapper myCheckinWrapper;
+ private final Wrapper myUpdateWrapper;
+ private final Wrapper myRollbackWrapper;
+
+ public VcsEventsListenerManagerImpl() {
+ myCheckinWrapper = new Wrapper(CheckinEnvironment.class);
+ myUpdateWrapper = new Wrapper(UpdateEnvironment.class);
+ myRollbackWrapper = new Wrapper(RollbackEnvironment.class);
+ }
+
+ @Override
+ public Object addCheckin(final Consumer>> consumer) {
+ return myCheckinWrapper.add(consumer);
+ }
+
+ @Override
+ public Object addUpdate(final Consumer>> consumer) {
+ return myUpdateWrapper.add(consumer);
+ }
+
+ @Override
+ public Object addRollback(final Consumer>> consumer) {
+ return myRollbackWrapper.add(consumer);
+ }
+
+ @Override
+ public void removeCheckin(Object key) {
+ myCheckinWrapper.remove(key);
+ }
+
+ @Override
+ public void removeUpdate(Object key) {
+ myUpdateWrapper.remove(key);
+ }
+
+ @Override
+ public void removeRollback(Object key) {
+ myRollbackWrapper.remove(key);
+ }
+
+ @Nullable
+ @Override
+ public CheckinEnvironment proxyCheckin(final VcsKey key, final CheckinEnvironment environment) {
+ return myCheckinWrapper.createProxy(key, environment);
+ }
+
+ @Nullable
+ @Override
+ public UpdateEnvironment proxyUpdate(final VcsKey key, final UpdateEnvironment environment) {
+ return myUpdateWrapper.createProxy(key, environment);
+ }
+
+ @Nullable
+ @Override
+ public RollbackEnvironment proxyRollback(final VcsKey key, final RollbackEnvironment environment) {
+ return myRollbackWrapper.createProxy(key, environment);
+ }
+
+ private static class Wrapper {
+ private final Map myListenersMap;
+ private final Map> myExistingMulticasters;
+ private final Class myClazz;
+ private final Object myLock;
+ private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.vcs.impl.VcsEventsListenerManagerImpl.Wrapper");
+
+ private Wrapper(final Class clazz) {
+ myClazz = clazz;
+ myListenersMap = new HashMap();
+ myExistingMulticasters = Collections.synchronizedMap(new HashMap>());
+ myLock = new Object();
+ }
+
+ @Nullable
+ public T createProxy(final VcsKey key, @Nullable final T environment) {
+ if (environment == null) return null;
+ final EventDispatcher eventDispatcher;
+ synchronized (myLock) {
+ assert ! myExistingMulticasters.containsKey(key);
+ eventDispatcher = EventDispatcher.create(EventListenerWrapperI.class);
+ myExistingMulticasters.put(key, eventDispatcher);
+ for (EventListenerWrapperI wrapper : myListenersMap.values()) {
+ eventDispatcher.addListener(wrapper);
+ }
+ }
+
+ final T proxy = (T) Proxy.newProxyInstance(myClazz.getClassLoader(),
+ new Class[]{myClazz},
+ new InvocationHandler() {
+ @Override
+ public Object invoke(final Object proxy, final Method method, final Object[] args) throws Throwable {
+ method.setAccessible(true);
+ synchronized (myLock) {
+ eventDispatcher.getMulticaster().consume(
+ new Pair>(key, new Consumer() {
+ @Override
+ public void consume(T t) {
+ try {
+ method.invoke(t, args);
+ }
+ catch (IllegalAccessException e) {
+ LOG.info(e);
+ }
+ catch (InvocationTargetException e) {
+ LOG.info(e);
+ }
+ }
+ }));
+ }
+ return method.invoke(environment, args);
+ }
+ });
+
+ return proxy;
+ }
+
+ public Object add(final Consumer>> consumer) {
+ final Object key = new Object();
+ synchronized (myLock) {
+ EventListenerWrapper listenerWrapper = new EventListenerWrapper(consumer);
+ myListenersMap.put(key, listenerWrapper);
+ for (EventDispatcher eventDispatcher : myExistingMulticasters.values()) {
+ eventDispatcher.addListener(listenerWrapper);
+ }
+ }
+ return key;
+ }
+
+ public void remove(Object key) {
+ synchronized (myLock) {
+ final EventListenerWrapperI listenerWrapper = myListenersMap.remove(key);
+ if (listenerWrapper != null) {
+ for (EventDispatcher dispatcher : myExistingMulticasters.values()) {
+ dispatcher.removeListener(listenerWrapper);
+ }
+ }
+ }
+ }
+
+ private interface EventListenerWrapperI extends Consumer>>, EventListener {}
+
+ private static class EventListenerWrapper implements EventListenerWrapperI {
+ private final Consumer>> myConsumer;
+
+ public EventListenerWrapper(Consumer>> consumer) {
+ myConsumer = consumer;
+ }
+
+ @Override
+ public void consume(Pair> vcsKeyConsumerPair) {
+ myConsumer.consume(vcsKeyConsumerPair);
+ }
+ }
+ }
+}
diff --git a/plugins/InspectionGadgets/src/com/siyeh/InspectionGadgetsBundle.properties b/plugins/InspectionGadgets/src/com/siyeh/InspectionGadgetsBundle.properties
index 39ac3f89973e..9aea0ed08ddf 100644
--- a/plugins/InspectionGadgets/src/com/siyeh/InspectionGadgetsBundle.properties
+++ b/plugins/InspectionGadgets/src/com/siyeh/InspectionGadgetsBundle.properties
@@ -203,10 +203,10 @@ public.method.without.logging.display.name='public' method without logging
public.method.without.logging.problem.descriptor='public' method #ref has no logging statement #loc
action.reset.telemetry.description=Reset telemetry data
-telemetry.table.column.inspection.name=Inspection Name
-telemetry.table.column.total.time=Total Run Time (msecs)
-telemetry.table.column.average.time=Average Run Time (msecs)
-telemetry.table.column.run.count=Total Run Count
+telemetry.table.column.inspection.name=Inspection
+telemetry.table.column.total.time=Total Run Time (ms)
+telemetry.table.column.average.time=Average Run Time (ms)
+telemetry.table.column.run.count=Run Count
telemetry.toolwindow.title=IG Telemetry
action.telemetry.refresh.description=Refresh telemetry display
finalize.doesnt.call.super.display.name='finalize()' does not call 'super.finalize()'
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/ImportUtils.java b/plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/ImportUtils.java
index 5f6137269533..ec3563362c77 100644
--- a/plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/ImportUtils.java
+++ b/plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/ImportUtils.java
@@ -535,7 +535,7 @@ public class ImportUtils{
PsiTreeUtil.getParentOfType(context, PsiClass.class);
if (InheritanceUtil.isCorrectDescendant(containingClass, memberClass,
true)) {
- return true;
+ return false;
}
final PsiFile psiFile = context.getContainingFile();
if (!(psiFile instanceof PsiJavaFile)) {
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/telemetry/InspectionGadgetsTelemetry.java b/plugins/InspectionGadgets/src/com/siyeh/ig/telemetry/InspectionGadgetsTelemetry.java
index bad05252e5dd..a0f81b205444 100644
--- a/plugins/InspectionGadgets/src/com/siyeh/ig/telemetry/InspectionGadgetsTelemetry.java
+++ b/plugins/InspectionGadgets/src/com/siyeh/ig/telemetry/InspectionGadgetsTelemetry.java
@@ -15,85 +15,39 @@
*/
package com.siyeh.ig.telemetry;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
-public class InspectionGadgetsTelemetry implements InspectionRunListener {
+public class InspectionGadgetsTelemetry {
- private final Map totalRunCount =
- new HashMap(400);
- private final Map totalRunTime =
- new HashMap(400);
- private final Object lock = new Object();
+ private final ConcurrentHashMap inspectionRunTimes =
+ new ConcurrentHashMap();
+
+ public List buildList() {
+ if (inspectionRunTimes.isEmpty()) {
+ return Collections.EMPTY_LIST;
+ }
+ return new ArrayList(inspectionRunTimes.values());
+ }
public void reportRun(String inspectionID, long runTime) {
- synchronized (lock) {
- final Integer count = totalRunCount.get(inspectionID);
- if (count == null) {
- totalRunCount.put(inspectionID, Integer.valueOf(1));
- } else {
- totalRunCount.put(inspectionID,
- Integer.valueOf(count.intValue() + 1));
- }
- final Long runTimeSoFar = totalRunTime.get(inspectionID);
- if (runTimeSoFar == null) {
- totalRunTime.put(inspectionID, Long.valueOf(runTime));
- } else {
- totalRunTime.put(inspectionID,
- Long.valueOf(runTimeSoFar.longValue() + runTime));
+ InspectionRunTime inspectionRunTime =
+ inspectionRunTimes.get(inspectionID);
+ if (inspectionRunTime == null) {
+ inspectionRunTime = new InspectionRunTime(inspectionID);
+ final InspectionRunTime oldValue =
+ inspectionRunTimes.putIfAbsent(inspectionID,
+ inspectionRunTime);
+ if (oldValue != null) {
+ inspectionRunTime = oldValue;
}
}
+ inspectionRunTime.addRunTime(runTime);
}
public void reset() {
- synchronized (lock) {
- totalRunCount.clear();
- totalRunTime.clear();
- }
- }
-
- public long getRunTimeForInspection(String inspectionID) {
- synchronized (lock) {
- final Long runTime = totalRunTime.get(inspectionID);
- if (runTime == null) {
- return 0L;
- }
- return runTime.longValue();
- }
- }
-
- public int getRunCountForInspection(String inspectionID) {
- synchronized (lock) {
- final Integer runCount = totalRunCount.get(inspectionID);
- if (runCount == null) {
- return 0;
- }
- return runCount.intValue();
- }
- }
-
- public String[] getInspections() {
- synchronized (lock) {
- final Set inspections = totalRunCount.keySet();
- final int numInspections = inspections.size();
- final String[] inspectionArray =
- inspections.toArray(new String[numInspections]);
- Arrays.sort(inspectionArray);
- return inspectionArray;
- }
- }
-
- public double getAverageRunTimeForInspection(String inspectionID) {
- synchronized (lock) {
- final Integer runCount = totalRunCount.get(inspectionID);
- if (runCount == null) {
- return 0.0;
- }
- final Long runTime = totalRunTime.get(inspectionID);
-
- return (double)runTime / (double)runCount;
- }
+ inspectionRunTimes.clear();
}
}
\ No newline at end of file
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/telemetry/InspectionRunTime.java b/plugins/InspectionGadgets/src/com/siyeh/ig/telemetry/InspectionRunTime.java
new file mode 100644
index 000000000000..639a468baf8c
--- /dev/null
+++ b/plugins/InspectionGadgets/src/com/siyeh/ig/telemetry/InspectionRunTime.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2010 Bas Leijdekkers
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.siyeh.ig.telemetry;
+
+public class InspectionRunTime {
+
+ private final String inspectionName;
+
+ private long totalRunTime = 0L;
+ private int runCount = 0;
+
+ public InspectionRunTime(String inspectionName) {
+ this.inspectionName = inspectionName;
+ }
+
+ public void addRunTime(long runTime) {
+ synchronized (this) {
+ totalRunTime += runTime;
+ runCount++;
+ }
+ }
+
+ public double getAverageRunTime() {
+ synchronized (this) {
+ return (double) totalRunTime / (double) runCount;
+ }
+ }
+
+ public String getInspectionName() {
+ return inspectionName;
+ }
+
+ public int getRunCount() {
+ synchronized (this) {
+ return runCount;
+ }
+ }
+
+ public long getTotalRunTime() {
+ synchronized (this) {
+ return totalRunTime;
+ }
+ }
+}
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/telemetry/ResetTelemetryAction.java b/plugins/InspectionGadgets/src/com/siyeh/ig/telemetry/ResetTelemetryAction.java
index 24f47ca5b430..163a753d40af 100644
--- a/plugins/InspectionGadgets/src/com/siyeh/ig/telemetry/ResetTelemetryAction.java
+++ b/plugins/InspectionGadgets/src/com/siyeh/ig/telemetry/ResetTelemetryAction.java
@@ -27,7 +27,7 @@ class ResetTelemetryAction extends AnAction{
private final TelemetryDisplay display;
ResetTelemetryAction(InspectionGadgetsTelemetry telemetry,
- TelemetryDisplay display){
+ TelemetryDisplay display){
super(CommonBundle.message("button.reset"),
InspectionGadgetsBundle.message(
"action.reset.telemetry.description"),
@@ -39,6 +39,6 @@ class ResetTelemetryAction extends AnAction{
@Override
public void actionPerformed(AnActionEvent event){
telemetry.reset();
- display.update();
+ display.update(telemetry.buildList());
}
}
\ No newline at end of file
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/telemetry/TableSorter.java b/plugins/InspectionGadgets/src/com/siyeh/ig/telemetry/TableSorter.java
deleted file mode 100644
index 07ac3cb05baa..000000000000
--- a/plugins/InspectionGadgets/src/com/siyeh/ig/telemetry/TableSorter.java
+++ /dev/null
@@ -1,485 +0,0 @@
-/*
- * Copyright 2000-2009 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.siyeh.ig.telemetry;
-
-import javax.swing.Icon;
-import javax.swing.JLabel;
-import javax.swing.JTable;
-import javax.swing.event.TableModelEvent;
-import javax.swing.event.TableModelListener;
-import javax.swing.table.*;
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.Graphics;
-import java.awt.Font;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
-import java.util.*;
-
-/**
- * TableSorter is a decorator for TableModels; adding sorting
- * functionality to a supplied TableModel. TableSorter does
- * not store or copy the data in its TableModel; instead it maintains
- * a map from the row indexes of the view to the row indexes of the
- * model. As requests are made of the sorter (like getValueAt(row, col))
- * they are passed to the underlying model after the row numbers
- * have been translated via the internal mapping array. This way,
- * the TableSorter appears to hold another copy of the table
- * with the rows in a different order.
- *
- * TableSorter registers itself as a listener to the underlying model,
- * just as the JTable itself would. Events recieved from the model
- * are examined, sometimes manipulated (typically widened), and then
- * passed on to the TableSorter's listeners (typically the JTable).
- * If a change to the model has invalidated the order of TableSorter's
- * rows, a note of this is made and the sorter will resort the
- * rows the next time a value is requested.
- *
- * When the tableHeader property is set, either by using the
- * setTableHeader() method or the two argument constructor, the
- * table header may be used as a complete UI for TableSorter.
- * The default renderer of the tableHeader is decorated with a renderer
- * that indicates the sorting status of each column. In addition,
- * a mouse listener is installed with the following behavior:
- *
- * -
- * Mouse-click: Clears the sorting status of all other columns
- * and advances the sorting status of that column through three
- * values: {NOT_SORTED, ASCENDING, DESCENDING} (then back to
- * NOT_SORTED again).
- *
-
- * SHIFT-mouse-click: Clears the sorting status of all other columns
- * and cycles the sorting status of the column through the same
- * three values, in the opposite order: {NOT_SORTED, DESCENDING, ASCENDING}.
- *
-
- * CONTROL-mouse-click and CONTROL-SHIFT-mouse-click: as above except
- * that the changes to the column do not cancel the statuses of columns
- * that are already sorting - giving a way to initiate a compound
- * sort.
- *
- *
- * This is a long overdue rewrite of a class of the same name that
- * first appeared in the swing table demos in 1997.
- *
- * @author Philip Milne
- * @author Brendon McLean
- * @author Dan van Enckevort
- * @author Parwinder Sekhon
- * @version 2.0 02/27/04
- */
-
-public class TableSorter extends AbstractTableModel {
-
- protected TableModel tableModel = null;
-
- public static final int DESCENDING = -1;
- public static final int NOT_SORTED = 0;
- public static final int ASCENDING = 1;
-
- private static final Directive EMPTY_DIRECTIVE = new Directive(-1, NOT_SORTED);
-
- public static final Comparator COMPARABLE_COMPARATOR = new Comparator() {
- public int compare(Comparable c1, Comparable c2) {
- return c1.compareTo(c2);
- }
- };
- public static final Comparator LEXICAL_COMPARATOR = new Comparator() {
- public int compare(Object o1, Object o2) {
- return o1.toString().compareTo(o2.toString());
- }
- };
-
- private Row[] viewToModel = null;
- int[] modelToView = null;
-
- private JTableHeader tableHeader = null;
- private MouseListener mouseListener;
- private TableModelListener tableModelListener;
- private final Map columnComparators = new HashMap();
- List sortingColumns = new ArrayList();
-
- public TableSorter() {
- mouseListener = new MouseHandler();
- tableModelListener = new TableModelHandler();
- }
-
- public TableSorter(TableModel tableModel) {
- this();
- setTableModel(tableModel);
- }
-
- public TableSorter(TableModel tableModel, JTableHeader tableHeader) {
- this();
- setTableHeader(tableHeader);
- setTableModel(tableModel);
- }
-
- void clearSortingState() {
- viewToModel = null;
- modelToView = null;
- }
-
- public TableModel getTableModel() {
- return tableModel;
- }
-
- public void setTableModel(TableModel tableModel) {
- if (this.tableModel != null) {
- this.tableModel.removeTableModelListener(tableModelListener);
- }
-
- this.tableModel = tableModel;
- if (this.tableModel != null) {
- this.tableModel.addTableModelListener(tableModelListener);
- }
-
- clearSortingState();
- fireTableStructureChanged();
- }
-
- public JTableHeader getTableHeader() {
- return tableHeader;
- }
-
- public void setTableHeader(JTableHeader tableHeader) {
- if (this.tableHeader != null) {
- this.tableHeader.removeMouseListener(mouseListener);
- final TableCellRenderer defaultRenderer =
- this.tableHeader.getDefaultRenderer();
- if (defaultRenderer instanceof SortableHeaderRenderer) {
- final TableCellRenderer tableCellRenderer =
- ((SortableHeaderRenderer)defaultRenderer).tableCellRenderer;
- this.tableHeader.setDefaultRenderer(tableCellRenderer);
- }
- }
- this.tableHeader = tableHeader;
- if (this.tableHeader != null) {
- this.tableHeader.addMouseListener(mouseListener);
- this.tableHeader.setDefaultRenderer(
- new SortableHeaderRenderer(this.tableHeader.getDefaultRenderer()));
- }
- }
-
- public boolean isSorting() {
- return sortingColumns.size() != 0;
- }
-
- private Directive getDirective(int column) {
- for (Directive directive : sortingColumns) {
- if (directive.column == column) {
- return directive;
- }
- }
- return EMPTY_DIRECTIVE;
- }
-
- public int getSortingStatus(int column) {
- return getDirective(column).direction;
- }
-
- private void sortingStatusChanged() {
- clearSortingState();
- fireTableDataChanged();
- if (tableHeader != null) {
- tableHeader.repaint();
- }
- }
-
- public void setSortingStatus(int column, int status) {
- final Directive directive = getDirective(column);
- if (directive != EMPTY_DIRECTIVE) {
- sortingColumns.remove(directive);
- }
- if (status != NOT_SORTED) {
- sortingColumns.add(new Directive(column, status));
- }
- sortingStatusChanged();
- }
-
- protected Icon getHeaderRendererIcon(int column, int size) {
- final Directive directive = getDirective(column);
- final int index = sortingColumns.indexOf(directive);
- if (index >= 0 && index == sortingColumns.size() - 1) {
- return new Arrow(directive.direction == DESCENDING, size);
- } else {
- return null;
- }
- }
-
- void cancelSorting() {
- sortingColumns.clear();
- sortingStatusChanged();
- }
-
- public void setColumnComparator(Class type, Comparator comparator) {
- if (comparator == null) {
- columnComparators.remove(type);
- } else {
- columnComparators.put(type, comparator);
- }
- }
-
- protected Comparator getComparator(int column) {
- final Class columnType = tableModel.getColumnClass(column);
- final Comparator comparator = columnComparators.get(columnType);
- if (comparator != null) {
- return comparator;
- }
- if (Comparable.class.isAssignableFrom(columnType)) {
- return COMPARABLE_COMPARATOR;
- }
- return LEXICAL_COMPARATOR;
- }
-
- private Row[] getViewToModel() {
- if (viewToModel == null ||
- viewToModel.length != tableModel.getRowCount()) {
- final int tableModelRowCount = tableModel.getRowCount();
- viewToModel = new Row[tableModelRowCount];
- for (int row = 0; row < tableModelRowCount; row++) {
- viewToModel[row] = new Row(row);
- }
- if (isSorting()) {
- Arrays.sort(viewToModel);
- }
- }
- return viewToModel;
- }
-
- public int modelIndex(int viewIndex) {
- return getViewToModel()[viewIndex].modelIndex;
- }
-
- int[] getModelToView() {
- if (modelToView == null) {
- final int n = getViewToModel().length;
- modelToView = new int[n];
- for (int i = 0; i < n; i++) {
- modelToView[modelIndex(i)] = i;
- }
- }
- return modelToView;
- }
-
- // TableModel interface methods
-
- public int getRowCount() {
- if (tableModel == null) {
- return 0;
- } else {
- return tableModel.getRowCount();
- }
- }
-
- public int getColumnCount() {
- if (tableModel == null) {
- return 0;
- } else {
- return tableModel.getColumnCount();
- }
- }
-
- public String getColumnName(int column) {
- return tableModel.getColumnName(column);
- }
-
- public Class getColumnClass(int column) {
- return tableModel.getColumnClass(column);
- }
-
- public boolean isCellEditable(int row, int column) {
- return tableModel.isCellEditable(modelIndex(row), column);
- }
-
- public Object getValueAt(int row, int column) {
- return tableModel.getValueAt(modelIndex(row), column);
- }
-
- public void setValueAt(Object aValue, int row, int column) {
- tableModel.setValueAt(aValue, modelIndex(row), column);
- }
-
- // Helper classes
-
- private class Row implements Comparable {
-
- int modelIndex;
-
- Row(int index) {
- modelIndex = index;
- }
-
- public int compareTo(Object o) {
- final int row1 = modelIndex;
- final int row2 = ((Row) o).modelIndex;
-
- for (Directive directive : sortingColumns) {
- final int column = directive.column;
- final Object o1 = tableModel.getValueAt(row1, column);
- final Object o2 = tableModel.getValueAt(row2, column);
-
- final int comparison;
- // Define null less than everything, except null.
- if (o1 == null && o2 == null) {
- comparison = 0;
- } else if (o1 == null) {
- comparison = -1;
- } else if (o2 == null) {
- comparison = 1;
- } else {
- final Comparator comparator = getComparator(column);
- comparison = comparator.compare(o1, o2);
- }
- if (comparison != 0) {
- if (directive.direction == DESCENDING) {
- return -comparison;
- } else {
- return comparison;
- }
- }
- }
- return 0;
- }
- }
-
- private class TableModelHandler implements TableModelListener {
- public void tableChanged(TableModelEvent e) {
- // If we're not sorting by anything, just pass the event along.
- if (!isSorting()) {
- clearSortingState();
- fireTableChanged(e);
- return;
- }
-
- // If the table structure has changed, cancel the sorting; the
- // sorting columns may have been either moved or deleted from
- // the model.
- if (e.getFirstRow() == TableModelEvent.HEADER_ROW) {
- cancelSorting();
- fireTableChanged(e);
- return;
- }
-
- // Something has happened to the data that may have invalidated the row order.
- clearSortingState();
- fireTableDataChanged();
- }
- }
-
- private class MouseHandler extends MouseAdapter {
- public void mouseClicked(MouseEvent event) {
- final JTableHeader header = (JTableHeader) event.getSource();
- final TableColumnModel columnModel = header.getColumnModel();
- final int viewColumn = columnModel.getColumnIndexAtX(event.getX());
- final TableColumn column = columnModel.getColumn(viewColumn);
- final int columnIndex = column.getModelIndex();
- if (columnIndex != -1) {
- int status = getSortingStatus(columnIndex);
-
- // Cycle the sorting states through {NOT_SORTED, ASCENDING, DESCENDING} or
- // {NOT_SORTED, DESCENDING, ASCENDING} depending on whether shift is pressed.
- if (status == ASCENDING) {
- status = DESCENDING;
- } else {
- status = ASCENDING;
- }
- setSortingStatus(columnIndex, status);
- }
- }
- }
-
- private static class Arrow implements Icon {
-
- private final boolean descending;
- private final int size;
-
- Arrow(boolean descending, int size) {
- this.descending = descending;
- this.size = size;
- }
-
- public void paintIcon(Component component, Graphics g, int x, int y) {
- final Color color;
- if (component == null) {
- color = Color.GRAY;
- } else {
- color = component.getBackground();
- }
- final int dx = size - 2;
- final int dy;
- if (descending) {
- dy = dx - 2;
- } else {
- dy = -(dx - 3);
- }
- // Align icon (roughly) with font baseline.
- y += 4 * size / 6;
- if (descending) {
- y += -dy;
- }
- g.translate(x, y);
- g.setColor(color.darker());
- g.fillPolygon(new int[]{dx >> 1, 0, dx}, new int[]{0, dy, dy}, 3);
- g.setColor(color);
- g.translate(-x, -y);
- }
-
- public int getIconWidth() {
- return size;
- }
-
- public int getIconHeight() {
- return size;
- }
- }
-
- private class SortableHeaderRenderer implements TableCellRenderer {
-
- TableCellRenderer tableCellRenderer;
-
- SortableHeaderRenderer(TableCellRenderer tableCellRenderer) {
- this.tableCellRenderer = tableCellRenderer;
- }
-
- public Component getTableCellRendererComponent(
- JTable table, Object value, boolean isSelected,
- boolean hasFocus, int row, int column) {
- final Component component =
- tableCellRenderer.getTableCellRendererComponent(table,
- value, isSelected, hasFocus, row, column);
- if (component instanceof JLabel) {
- final JLabel label = (JLabel) component;
- label.setHorizontalTextPosition(JLabel.LEADING);
- final int modelColumn = table.convertColumnIndexToModel(column);
- final Font font = label.getFont();
- label.setIcon(getHeaderRendererIcon(modelColumn, font.getSize()));
- }
- return component;
- }
- }
-
- private static class Directive {
-
- int column;
- int direction;
-
- Directive(int column, int direction) {
- this.column = column;
- this.direction = direction;
- }
- }
-}
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/telemetry/TelemetryDisplay.java b/plugins/InspectionGadgets/src/com/siyeh/ig/telemetry/TelemetryDisplay.java
index 7e7eb28c8147..6ea1ab576da4 100644
--- a/plugins/InspectionGadgets/src/com/siyeh/ig/telemetry/TelemetryDisplay.java
+++ b/plugins/InspectionGadgets/src/com/siyeh/ig/telemetry/TelemetryDisplay.java
@@ -16,31 +16,153 @@
package com.siyeh.ig.telemetry;
import com.intellij.ui.ScrollPaneFactory;
+import com.intellij.ui.TableSpeedSearch;
import com.intellij.ui.table.JBTable;
+import com.intellij.util.ui.ColumnInfo;
+import com.intellij.util.ui.ListTableModel;
+import com.siyeh.InspectionGadgetsBundle;
import javax.swing.*;
-import javax.swing.table.JTableHeader;
+import java.text.NumberFormat;
+import java.util.Comparator;
+import java.util.List;
public class TelemetryDisplay {
- private final JTable table;
private final JScrollPane scrollPane;
- private final TableSorter model;
+ private final ListTableModel tableModel;
public TelemetryDisplay(InspectionGadgetsTelemetry telemetry){
- model = new TableSorter(new TelemetryTableModel(telemetry));
- table = new JBTable(model);
- final JTableHeader tableHeader = table.getTableHeader();
- model.setTableHeader(tableHeader);
+ tableModel = new ListTableModel(createColumns(),
+ telemetry.buildList(), 0);
+ final JTable table = new JBTable(tableModel);
+ new TableSpeedSearch(table);
scrollPane = ScrollPaneFactory.createScrollPane(table);
}
+ private static ColumnInfo[] createColumns() {
+ final Comparator nameComparator =
+ new Comparator() {
+
+ public int compare(InspectionRunTime runTime1,
+ InspectionRunTime runTime2) {
+ return runTime1.getInspectionName().compareToIgnoreCase(
+ runTime2.getInspectionName());
+ }
+ };
+ final Comparator runCountComparator =
+ new Comparator() {
+
+ public int compare(InspectionRunTime runTime1,
+ InspectionRunTime runTime2) {
+ return runTime1.getRunCount() - runTime2.getRunCount();
+ }
+ };
+ final Comparator totalRunTimeComparator =
+ new Comparator() {
+
+ public int compare(InspectionRunTime runTime1,
+ InspectionRunTime runTime2) {
+ final long totalRunTime1 = runTime1.getTotalRunTime();
+ final long totalRunTime2 = runTime2.getTotalRunTime();
+ if (totalRunTime1 < totalRunTime2) {
+ return -1;
+ } else if (totalRunTime1 > totalRunTime2) {
+ return 1;
+ } else {
+ return 0;
+ }
+ }
+ };
+ final Comparator averageRunTimeComparator =
+ new Comparator() {
+
+ public int compare(InspectionRunTime runTime1,
+ InspectionRunTime runTime2) {
+ final double averageRunTime1 =
+ runTime1.getAverageRunTime();
+ final double averageRunTime2 =
+ runTime2.getAverageRunTime();
+ if (averageRunTime1 < averageRunTime2) {
+ return -1;
+ } else if (averageRunTime1 > averageRunTime2) {
+ return 1;
+ } else {
+ return 0;
+ }
+ }
+ };
+ return new ColumnInfo[] {
+ new ColumnInfo(
+ InspectionGadgetsBundle.message(
+ "telemetry.table.column.inspection.name")) {
+ @Override
+ public String valueOf(InspectionRunTime inspectionRunTime) {
+ return inspectionRunTime.getInspectionName();
+ }
+
+ @Override
+ public Comparator getComparator() {
+ return nameComparator;
+ }
+ },
+ new ColumnInfo(
+ InspectionGadgetsBundle.message(
+ "telemetry.table.column.run.count")) {
+ @Override
+ public Integer valueOf(
+ InspectionRunTime inspectionRunTime) {
+ return Integer.valueOf(inspectionRunTime.getRunCount());
+ }
+
+ @Override
+ public Comparator getComparator() {
+ return runCountComparator;
+ }
+ },
+ new ColumnInfo(
+ InspectionGadgetsBundle.message(
+ "telemetry.table.column.total.time")) {
+ @Override
+ public Long valueOf(InspectionRunTime inspectionRunTime) {
+ return Long.valueOf(
+ inspectionRunTime.getTotalRunTime());
+ }
+
+ @Override
+ public Comparator getComparator() {
+ return totalRunTimeComparator;
+ }
+ },
+ new ColumnInfo(
+ InspectionGadgetsBundle.message(
+ "telemetry.table.column.average.time")) {
+
+ private final NumberFormat format =
+ NumberFormat.getNumberInstance();
+ {
+ format.setMaximumFractionDigits(2);
+ format.setMinimumFractionDigits(2);
+ }
+
+ @Override
+ public String valueOf(InspectionRunTime inspectionRunTime) {
+ return format.format(inspectionRunTime.getAverageRunTime());
+ }
+
+ @Override
+ public Comparator getComparator() {
+ return averageRunTimeComparator;
+ }
+ }
+ };
+ }
+
public JComponent getContentPane(){
return scrollPane;
}
- public void update(){
- table.setModel(model);
- table.repaint();
+ public void update(List inspectionRunTimes){
+ tableModel.setItems(inspectionRunTimes);
}
}
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/telemetry/TelemetryTableModel.java b/plugins/InspectionGadgets/src/com/siyeh/ig/telemetry/TelemetryTableModel.java
deleted file mode 100644
index d18a30f20758..000000000000
--- a/plugins/InspectionGadgets/src/com/siyeh/ig/telemetry/TelemetryTableModel.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright 2003-2010 Dave Griffith, Bas Leijdekkers
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.siyeh.ig.telemetry;
-
-import org.jetbrains.annotations.Nullable;
-
-import javax.swing.table.DefaultTableModel;
-import java.text.NumberFormat;
-
-import com.siyeh.InspectionGadgetsBundle;
-
-class TelemetryTableModel extends DefaultTableModel {
-
- private final InspectionGadgetsTelemetry telemetry;
- private final NumberFormat format = NumberFormat.getNumberInstance();
-
- TelemetryTableModel(InspectionGadgetsTelemetry telemetry) {
- this.telemetry = telemetry;
- format.setMaximumFractionDigits(2);
- format.setMinimumFractionDigits(2);
- }
-
- @Override
- public int getColumnCount() {
- return 4;
- }
-
- @Override
- @Nullable
- public Class getColumnClass(int column) {
- switch (column) {
- case 0:
- return String.class;
- case 1:
- return Long.class;
- case 2:
- return String.class;
- case 3:
- return Integer.class;
- default:
- return null;
- }
- }
-
- @Override
- public int getRowCount() {
- if (telemetry == null) {
- return 0;
- }
- return telemetry.getInspections().length;
- }
-
- @Override
- @Nullable
- public Object getValueAt(int row, int column) {
- if (telemetry == null) {
- return null;
- }
- final String[] inspections = telemetry.getInspections();
- final String inspection = inspections[row];
- switch (column) {
- case 0:
- return inspection;
- case 1:
- final long totalRunTime =
- telemetry.getRunTimeForInspection(inspection);
- return Long.valueOf(totalRunTime);
- case 2:
- final double averageRunTime =
- telemetry.getAverageRunTimeForInspection(inspection);
- return format.format(averageRunTime);
- case 3:
- final int runCount =
- telemetry.getRunCountForInspection(inspection);
- return Integer.valueOf(runCount);
- default:
- return null;
- }
- }
-
- @Override
- public void setValueAt(Object object, int i,
- int i1) {
- //don't do anything
- }
-
- @Override
- @Nullable
- public String getColumnName(int column) {
- switch (column) {
- case 0:
- return InspectionGadgetsBundle.message(
- "telemetry.table.column.inspection.name");
- case 1:
- return InspectionGadgetsBundle.message(
- "telemetry.table.column.total.time");
- case 2:
- return InspectionGadgetsBundle.message(
- "telemetry.table.column.average.time");
- case 3:
- return InspectionGadgetsBundle.message(
- "telemetry.table.column.run.count");
- default:
- return null;
- }
- }
-}
\ No newline at end of file
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/telemetry/TelemetryToolWindow.java b/plugins/InspectionGadgets/src/com/siyeh/ig/telemetry/TelemetryToolWindow.java
index 9f5d26279002..686cb36ea175 100644
--- a/plugins/InspectionGadgets/src/com/siyeh/ig/telemetry/TelemetryToolWindow.java
+++ b/plugins/InspectionGadgets/src/com/siyeh/ig/telemetry/TelemetryToolWindow.java
@@ -42,7 +42,8 @@ public class TelemetryToolWindow {
final TelemetryDisplay telemetryDisplay =
new TelemetryDisplay(telemetry);
final DefaultActionGroup toolbarGroup = new DefaultActionGroup();
- toolbarGroup.add(new UpdateTelemetryViewAction(telemetryDisplay));
+ toolbarGroup.add(
+ new UpdateTelemetryViewAction(telemetry, telemetryDisplay));
toolbarGroup.add(new ResetTelemetryAction(telemetry, telemetryDisplay));
final ActionManager actionManager = ActionManager.getInstance();
final ActionToolbar toolbar =
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/telemetry/UpdateTelemetryViewAction.java b/plugins/InspectionGadgets/src/com/siyeh/ig/telemetry/UpdateTelemetryViewAction.java
index 6d920a290691..8524854cea70 100644
--- a/plugins/InspectionGadgets/src/com/siyeh/ig/telemetry/UpdateTelemetryViewAction.java
+++ b/plugins/InspectionGadgets/src/com/siyeh/ig/telemetry/UpdateTelemetryViewAction.java
@@ -23,18 +23,21 @@ import com.siyeh.InspectionGadgetsBundle;
class UpdateTelemetryViewAction extends AnAction{
+ private final InspectionGadgetsTelemetry telemetry;
private final TelemetryDisplay telemetryDisplay;
- UpdateTelemetryViewAction(TelemetryDisplay telemetryDisplay){
+ UpdateTelemetryViewAction(InspectionGadgetsTelemetry telemetry,
+ TelemetryDisplay telemetryDisplay){
super(CommonBundle.message("action.refresh"),
InspectionGadgetsBundle.message(
"action.telemetry.refresh.description"),
IconLoader.getIcon("/actions/sync.png"));
+ this.telemetry = telemetry;
this.telemetryDisplay = telemetryDisplay;
}
@Override
public void actionPerformed(AnActionEvent event){
- telemetryDisplay.update();
+ telemetryDisplay.update(telemetry.buildList());
}
}
\ No newline at end of file
diff --git a/plugins/android/src/org/jetbrains/android/AndroidRenameResourceProcessor.java b/plugins/android/src/org/jetbrains/android/AndroidRenameResourceProcessor.java
index 084e1803fb18..2355fcc3366a 100644
--- a/plugins/android/src/org/jetbrains/android/AndroidRenameResourceProcessor.java
+++ b/plugins/android/src/org/jetbrains/android/AndroidRenameResourceProcessor.java
@@ -47,6 +47,7 @@ import org.jetbrains.android.resourceManagers.LocalResourceManager;
import org.jetbrains.android.resourceManagers.ResourceManager;
import org.jetbrains.android.util.AndroidBundle;
import org.jetbrains.android.util.AndroidResourceUtil;
+import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.ArrayList;
@@ -62,7 +63,7 @@ public class AndroidRenameResourceProcessor extends RenamePsiElementProcessor {
// for tests
public static volatile boolean ASK = true;
- public boolean canProcessElement(final PsiElement element) {
+ public boolean canProcessElement(@NotNull final PsiElement element) {
return ApplicationManager.getApplication().runReadAction(new Computable() {
public Boolean compute() {
if (element instanceof PsiFile) {
diff --git a/plugins/ant/src/com/intellij/lang/ant/dom/AntRenameProcessor.java b/plugins/ant/src/com/intellij/lang/ant/dom/AntRenameProcessor.java
index 95df74e528cc..f32238692923 100644
--- a/plugins/ant/src/com/intellij/lang/ant/dom/AntRenameProcessor.java
+++ b/plugins/ant/src/com/intellij/lang/ant/dom/AntRenameProcessor.java
@@ -22,6 +22,7 @@ import com.intellij.psi.PsiElement;
import com.intellij.refactoring.rename.RenamePsiElementProcessor;
import com.intellij.util.xml.DomElement;
import com.intellij.util.xml.DomTarget;
+import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.Collection;
@@ -58,7 +59,7 @@ public class AntRenameProcessor extends RenamePsiElementProcessor{
}
}
- public boolean canProcessElement(PsiElement element) {
+ public boolean canProcessElement(@NotNull PsiElement element) {
final AntDomElement antElement = convertToAntDomElement(element);
if (antElement instanceof AntDomProperty || antElement instanceof AntDomAntCallParam) {
return true;
diff --git a/plugins/copyright/src/com/maddyhome/idea/copyright/util/FileTypeUtil.java b/plugins/copyright/src/com/maddyhome/idea/copyright/util/FileTypeUtil.java
index f9559579f0fa..05af2c44951d 100644
--- a/plugins/copyright/src/com/maddyhome/idea/copyright/util/FileTypeUtil.java
+++ b/plugins/copyright/src/com/maddyhome/idea/copyright/util/FileTypeUtil.java
@@ -16,6 +16,7 @@
package com.maddyhome.idea.copyright.util;
+import com.intellij.ide.impl.ProjectUtil;
import com.intellij.lang.Commenter;
import com.intellij.lang.LanguageCommenters;
import com.intellij.openapi.diagnostic.Logger;
@@ -28,7 +29,6 @@ import com.maddyhome.idea.copyright.CopyrightUpdaters;
import com.maddyhome.idea.copyright.options.LanguageOptions;
import java.util.*;
-import java.util.regex.Matcher;
public class FileTypeUtil
{
@@ -226,6 +226,7 @@ public class FileTypeUtil
return false;
}
+ if (ProjectUtil.isProjectOrWorkspaceFile(file)) return false;
FileType type = FileTypeManager.getInstance().getFileTypeByFile(file);
return types.get(type.getName()) != null;
@@ -237,7 +238,9 @@ public class FileTypeUtil
{
return false;
}
-
+ final VirtualFile virtualFile = file.getVirtualFile();
+ if (virtualFile == null) return false;
+ if (ProjectUtil.isProjectOrWorkspaceFile(virtualFile)) return false;
return isSupportedType(file.getFileType());
}
diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/CvsVcs2.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/CvsVcs2.java
index f7f9319a5bb3..89de8f83eb02 100644
--- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/CvsVcs2.java
+++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/CvsVcs2.java
@@ -265,11 +265,11 @@ public class CvsVcs2 extends AbstractVcs implements TransactionProvider, EditFil
}
@NotNull
- public CheckinEnvironment getCheckinEnvironment() {
+ public CheckinEnvironment createCheckinEnvironment() {
return myCvsCheckinEnvironment;
}
- public RollbackEnvironment getRollbackEnvironment() {
+ public RollbackEnvironment createRollbackEnvironment() {
if (myCvsRollbackEnvironment == null) {
myCvsRollbackEnvironment = new CvsRollbackEnvironment(myProject);
}
@@ -289,7 +289,7 @@ public class CvsVcs2 extends AbstractVcs implements TransactionProvider, EditFil
return CvsBundle.message("menu.text.cvsGroup");
}
- public UpdateEnvironment getUpdateEnvironment() {
+ public UpdateEnvironment createUpdateEnvironment() {
return myCvsUpdateEnvironment;
}
diff --git a/plugins/git4idea/src/git4idea/GitVcs.java b/plugins/git4idea/src/git4idea/GitVcs.java
index 6ddbeb88dc0b..95de9e110c94 100644
--- a/plugins/git4idea/src/git4idea/GitVcs.java
+++ b/plugins/git4idea/src/git4idea/GitVcs.java
@@ -230,7 +230,7 @@ public class GitVcs extends AbstractVcs {
@Override
@NotNull
- public CheckinEnvironment getCheckinEnvironment() {
+ public CheckinEnvironment createCheckinEnvironment() {
return myCheckinEnvironment;
}
@@ -242,7 +242,7 @@ public class GitVcs extends AbstractVcs {
@Override
@NotNull
- public RollbackEnvironment getRollbackEnvironment() {
+ public RollbackEnvironment createRollbackEnvironment() {
return myRollbackEnvironment;
}
@@ -265,7 +265,7 @@ public class GitVcs extends AbstractVcs {
@Override
@Nullable
- public UpdateEnvironment getUpdateEnvironment() {
+ public UpdateEnvironment createUpdateEnvironment() {
return myUpdateEnvironment;
}
diff --git a/plugins/git4idea/src/git4idea/checkin/GitCheckinEnvironment.java b/plugins/git4idea/src/git4idea/checkin/GitCheckinEnvironment.java
index 564360e240dd..69abc82031d8 100644
--- a/plugins/git4idea/src/git4idea/checkin/GitCheckinEnvironment.java
+++ b/plugins/git4idea/src/git4idea/checkin/GitCheckinEnvironment.java
@@ -30,6 +30,7 @@ import com.intellij.openapi.vcs.changes.VcsDirtyScopeManager;
import com.intellij.openapi.vcs.checkin.CheckinEnvironment;
import com.intellij.openapi.vcs.ui.RefreshableOnComponent;
import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.ui.GuiUtils;
import com.intellij.util.NullableFunction;
import com.intellij.util.PairConsumer;
import com.intellij.util.containers.ContainerUtil;
@@ -48,31 +49,11 @@ import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-import javax.swing.JCheckBox;
-import javax.swing.JComboBox;
-import javax.swing.JComponent;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import java.awt.EventQueue;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Insets;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
+import javax.swing.*;
+import java.awt.*;
+import java.io.*;
+import java.util.*;
import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.StringTokenizer;
-import java.util.TreeSet;
/**
* Git environment for commit operations.
@@ -266,14 +247,14 @@ public class GitCheckinEnvironment implements CheckinEnvironment {
if (line.length() == 0) {
continue;
}
- String[] tk = line.split("[ \t]+");
+ String[] tk = line.split("\t");
switch (tk[0].charAt(0)) {
case 'M':
case 'A':
- realAdded.add(VcsUtil.getFilePath(rootPath + "/" + tk[tk.length - 1]));
+ realAdded.add(VcsUtil.getFilePath(rootPath + "/" + tk[1]));
break;
case 'D':
- realRemoved.add(VcsUtil.getFilePathForDeletedFile(rootPath + "/" + tk[tk.length - 1], false));
+ realRemoved.add(VcsUtil.getFilePathForDeletedFile(rootPath + "/" + tk[1], false));
break;
default:
throw new IllegalStateException("Unexpected status: " + line);
@@ -298,11 +279,10 @@ public class GitCheckinEnvironment implements CheckinEnvironment {
}
final int[] rc = new int[1];
try {
- EventQueue.invokeAndWait(new Runnable() {
+ GuiUtils.runOrInvokeAndWait(new Runnable() {
public void run() {
rc[0] = Messages.showOkCancelDialog(project, GitBundle.message("commit.partial.merge.message", fileList.toString()),
GitBundle.getString("commit.partial.merge.title"), null);
-
}
});
}
diff --git a/plugins/git4idea/src/git4idea/vfs/GitVFSListener.java b/plugins/git4idea/src/git4idea/vfs/GitVFSListener.java
index 452a307ddd6e..61d175b758e0 100644
--- a/plugins/git4idea/src/git4idea/vfs/GitVFSListener.java
+++ b/plugins/git4idea/src/git4idea/vfs/GitVFSListener.java
@@ -148,14 +148,14 @@ public class GitVFSListener extends VcsVFSListener {
});
}
}
- addedFiles.retainAll(retainedFiles);
- UIUtil.invokeLaterIfNeeded(new Runnable() {
- @Override
- public void run() {
- originalExecuteAdd(addedFiles, copiedFiles);
- }
- });
}
+ addedFiles.retainAll(retainedFiles);
+ UIUtil.invokeLaterIfNeeded(new Runnable() {
+ @Override
+ public void run() {
+ originalExecuteAdd(addedFiles, copiedFiles);
+ }
+ });
}
});
}
diff --git a/plugins/git4idea/tests/git4idea/tests/ChangeListManagerUpdateOnFileChangeTest.java b/plugins/git4idea/tests/git4idea/tests/ChangeListManagerUpdateOnFileChangeTest.java
index c64512dc9033..c7aeccb90fbb 100644
--- a/plugins/git4idea/tests/git4idea/tests/ChangeListManagerUpdateOnFileChangeTest.java
+++ b/plugins/git4idea/tests/git4idea/tests/ChangeListManagerUpdateOnFileChangeTest.java
@@ -37,7 +37,7 @@ import static org.testng.Assert.assertTrue;
* TODO: This shouldn't rely on Git. Either test all version controls, either test a mock version control. Or even use both approaches.
* @author Kirill Likhodedov
*/
-public class ChangeListManagerUpdateOnFileChangeTest extends GitSingleUserTestCase {
+public class ChangeListManagerUpdateOnFileChangeTest extends GitSingleUserTest {
private ChangeListManagerImpl myChangeListManager;
private VirtualFile afile;
diff --git a/plugins/git4idea/tests/git4idea/tests/GitBranchTest.java b/plugins/git4idea/tests/git4idea/tests/GitBranchTest.java
index ccc72d192662..d11f58419973 100644
--- a/plugins/git4idea/tests/git4idea/tests/GitBranchTest.java
+++ b/plugins/git4idea/tests/git4idea/tests/GitBranchTest.java
@@ -29,7 +29,7 @@ import static org.testng.Assert.*;
/**
* @author Kirill Likhodedov
*/
-public class GitBranchTest extends GitCollaborativeTestCase {
+public class GitBranchTest extends GitCollaborativeTest {
private List myBranches;
private VirtualFile myDir;
diff --git a/plugins/git4idea/tests/git4idea/tests/GitChangeProviderTest.java b/plugins/git4idea/tests/git4idea/tests/GitChangeProviderTest.java
index 985a7c2ef010..e89f1b3ba746 100644
--- a/plugins/git4idea/tests/git4idea/tests/GitChangeProviderTest.java
+++ b/plugins/git4idea/tests/git4idea/tests/GitChangeProviderTest.java
@@ -45,7 +45,7 @@ import static org.testng.Assert.*;
* 3. Calls ChangeProvider.getChanges() and checks that the changes are there.
* @author Kirill Likhodedov
*/
-public class GitChangeProviderTest extends GitSingleUserTestCase {
+public class GitChangeProviderTest extends GitSingleUserTest {
private GitChangeProvider myChangeProvider;
private VcsModifiableDirtyScope myDirtyScope;
diff --git a/plugins/git4idea/tests/git4idea/tests/GitCollaborativeTestCase.java b/plugins/git4idea/tests/git4idea/tests/GitCollaborativeTest.java
similarity index 96%
rename from plugins/git4idea/tests/git4idea/tests/GitCollaborativeTestCase.java
rename to plugins/git4idea/tests/git4idea/tests/GitCollaborativeTest.java
index 382106f862a9..c572a20f2c74 100644
--- a/plugins/git4idea/tests/git4idea/tests/GitCollaborativeTestCase.java
+++ b/plugins/git4idea/tests/git4idea/tests/GitCollaborativeTest.java
@@ -19,7 +19,7 @@ package git4idea.tests;
*
* @author Kirill Likhodedov
*/
-public class GitCollaborativeTestCase extends GitTestCase {
+public class GitCollaborativeTest extends GitTest {
public static final String MAIN_USER_NAME = "John Smith";
public static final String MAIN_USER_EMAIL = "john.smith@email.com";
public static final String BROTHER_USER_NAME = "Bob Doe";
diff --git a/plugins/git4idea/tests/git4idea/tests/GitHistoryUtilsTestCase.java b/plugins/git4idea/tests/git4idea/tests/GitHistoryUtilsTest.java
similarity index 99%
rename from plugins/git4idea/tests/git4idea/tests/GitHistoryUtilsTestCase.java
rename to plugins/git4idea/tests/git4idea/tests/GitHistoryUtilsTest.java
index 9bf872e10951..ee9912245565 100644
--- a/plugins/git4idea/tests/git4idea/tests/GitHistoryUtilsTestCase.java
+++ b/plugins/git4idea/tests/git4idea/tests/GitHistoryUtilsTest.java
@@ -48,7 +48,7 @@ import static org.testng.Assert.*;
*
* @author Kirill Likhodedov
*/
-public class GitHistoryUtilsTestCase extends GitSingleUserTestCase {
+public class GitHistoryUtilsTest extends GitSingleUserTest {
private VirtualFile afile;
private FilePath bfilePath;
diff --git a/plugins/git4idea/tests/git4idea/tests/GitMergeTest.java b/plugins/git4idea/tests/git4idea/tests/GitMergeTest.java
new file mode 100644
index 000000000000..4658dd54b56b
--- /dev/null
+++ b/plugins/git4idea/tests/git4idea/tests/GitMergeTest.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2000-2010 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package git4idea.tests;
+
+import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.application.ModalityState;
+import com.intellij.openapi.vcs.changes.Change;
+import com.intellij.openapi.vcs.changes.ChangeListManager;
+import com.intellij.openapi.vcs.changes.LocalChangeList;
+import org.testng.annotations.Test;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import static org.testng.Assert.assertTrue;
+
+/**
+ * @author Kirill Likhodedov
+ */
+public class GitMergeTest extends GitCollaborativeTest {
+
+ /**
+ * Tests that merge commit after resolving a conflict works fine if there is a file with spaces in its path.
+ * IDEA-50318
+ */
+ @Test
+ public void testMergeCommitWithSpacesInPath() throws IOException {
+ final String PATH = "dir with spaces/file with spaces.txt";
+ GitTestUtil.createFileStructure(myProject, myRepo, PATH);
+ myRepo.commit();
+ myRepo.push("origin", "master");
+ editFileInCommand(myRepo.getDir().findFileByRelativePath(PATH), "my content");
+ myRepo.addCommit();
+
+ myBrotherRepo.pull();
+ editFileInCommand(myBrotherRepo.getDir().findFileByRelativePath(PATH), "brother content");
+ myBrotherRepo.addCommit();
+ myBrotherRepo.push();
+
+ myRepo.pull();
+ editFileInCommand(myRepo.getDir().findFileByRelativePath(PATH), "my and brother content"); // manually resolving conflict
+ myRepo.add();
+
+ final ChangeListManager changeListManager = ChangeListManager.getInstance(myProject);
+ changeListManager.ensureUpToDate(false);
+ final LocalChangeList changeList = changeListManager.getDefaultChangeList();
+ changeList.setName("Name");
+ changeList.setComment("Commit message");
+ final AtomicBoolean res = new AtomicBoolean();
+ ApplicationManager.getApplication().invokeAndWait(new Runnable() {
+ @Override
+ public void run() {
+ res.set(changeListManager.commitChangesSynchronouslyWithResult(changeList, new ArrayList(
+ changeListManager.getChangesIn(myRepo.getDir()))));
+ }
+ }, ModalityState.defaultModalityState());
+ assertTrue(res.get());
+ changeListManager.ensureUpToDate(false);
+ assertTrue(changeListManager.getChangesIn(myRepo.getDir()).isEmpty());
+ }
+
+}
diff --git a/plugins/git4idea/tests/git4idea/tests/GitSingleUserTestCase.java b/plugins/git4idea/tests/git4idea/tests/GitSingleUserTest.java
similarity index 95%
rename from plugins/git4idea/tests/git4idea/tests/GitSingleUserTestCase.java
rename to plugins/git4idea/tests/git4idea/tests/GitSingleUserTest.java
index 89e65d1aba36..dc5610400664 100644
--- a/plugins/git4idea/tests/git4idea/tests/GitSingleUserTestCase.java
+++ b/plugins/git4idea/tests/git4idea/tests/GitSingleUserTest.java
@@ -18,7 +18,7 @@ package git4idea.tests;
/**
* @author Kirill Likhodedov
*/
-public class GitSingleUserTestCase extends GitTestCase {
+public class GitSingleUserTest extends GitTest {
public static final String CONFIG_USER_NAME = "John Smith";
public static final String CONFIG_USER_EMAIL = "john.smith@email.com";
diff --git a/plugins/git4idea/tests/git4idea/tests/GitTestCase.java b/plugins/git4idea/tests/git4idea/tests/GitTest.java
similarity index 94%
rename from plugins/git4idea/tests/git4idea/tests/GitTestCase.java
rename to plugins/git4idea/tests/git4idea/tests/GitTest.java
index f7998aaa99ce..dad816cc5734 100644
--- a/plugins/git4idea/tests/git4idea/tests/GitTestCase.java
+++ b/plugins/git4idea/tests/git4idea/tests/GitTest.java
@@ -27,8 +27,8 @@ import org.jetbrains.annotations.Nullable;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
-import javax.swing.SwingUtilities;
-import java.awt.EventQueue;
+import javax.swing.*;
+import java.awt.*;
import java.io.File;
import java.io.IOException;
@@ -38,7 +38,7 @@ import java.io.IOException;
* contains git executable.
* @author Kirill Likhodedov
*/
-public abstract class GitTestCase extends AbstractVcsTestCase {
+public abstract class GitTest extends AbstractVcsTestCase {
public static final String GIT_EXECUTABLE_PATH = "IDEA_TEST_GIT_EXECUTABLE_PATH";
@@ -84,7 +84,7 @@ public abstract class GitTestCase extends AbstractVcsTestCase {
}
/**
- * Different implementations for {@link git4idea.tests.GitSingleUserTestCase} and {@link git4idea.tests.GitCollaborativeTestCase}:
+ * Different implementations for {@link GitSingleUserTest} and {@link GitCollaborativeTest}:
* create a single or several repositories, which will be used in tests.
* @return main repository which IDEA project will be bound to.
*/
diff --git a/plugins/git4idea/tests/git4idea/tests/GitTestRepository.java b/plugins/git4idea/tests/git4idea/tests/GitTestRepository.java
index 3cdaa2b2f3b0..54e069b312da 100644
--- a/plugins/git4idea/tests/git4idea/tests/GitTestRepository.java
+++ b/plugins/git4idea/tests/git4idea/tests/GitTestRepository.java
@@ -37,27 +37,27 @@ import static org.testng.Assert.fail;
* @author Kirill Likhodedov
*/
public class GitTestRepository {
- @NotNull private final GitTestCase myTest;
+ @NotNull private final GitTest myTest;
@NotNull private final TempDirTestFixture myDirFixture;
private VirtualFile myDir;
- public GitTestRepository(@NotNull GitTestCase test, @NotNull TempDirTestFixture fixture) {
+ public GitTestRepository(@NotNull GitTest test, @NotNull TempDirTestFixture fixture) {
myTest = test;
myDirFixture = fixture;
}
/**
* Creates a new Mercurial repository in a new temporary test directory.
- * @param testCase reference to the test case instance.
+ * @param test reference to the test case instance.
* @param parameters optional array of parameters passed to 'git init'
* @return created repository.
*/
- public static GitTestRepository create(GitTestCase testCase, String... parameters) throws Exception {
+ public static GitTestRepository create(GitTest test, String... parameters) throws Exception {
final TempDirTestFixture dirFixture = createFixtureDir();
final File repo = new File(dirFixture.getTempDirPath());
- final ProcessOutput processOutput = testCase.executeCommand(repo, join("init", parameters));
+ final ProcessOutput processOutput = test.executeCommand(repo, join("init", parameters));
AbstractVcsTestCase.verify(processOutput);
- return new GitTestRepository(testCase, dirFixture);
+ return new GitTestRepository(test, dirFixture);
}
public static GitTestRepository cloneFrom(GitTestRepository parent) throws Exception {
@@ -307,7 +307,7 @@ public class GitTestRepository {
}
@NotNull
- public GitTestCase getTest() {
+ public GitTest getTest() {
return myTest;
}
}
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/assignment/GroovyAssignabilityCheckInspection.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/assignment/GroovyAssignabilityCheckInspection.java
index bcc9d6603d2e..ff504996c2b6 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/assignment/GroovyAssignabilityCheckInspection.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/assignment/GroovyAssignabilityCheckInspection.java
@@ -43,6 +43,7 @@ import org.jetbrains.plugins.groovy.lang.psi.api.statements.blocks.GrOpenBlock;
import org.jetbrains.plugins.groovy.lang.psi.api.statements.branch.GrReturnStatement;
import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.*;
import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.members.GrAccessorMethod;
+import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.members.GrBuilderMethod;
import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.members.GrMethod;
import org.jetbrains.plugins.groovy.lang.psi.api.types.GrCodeReferenceElement;
import org.jetbrains.plugins.groovy.lang.psi.controlFlow.Instruction;
@@ -336,6 +337,7 @@ public class GroovyAssignabilityCheckInspection extends BaseInspection {
private boolean checkMethodApplicability(GroovyResolveResult methodResolveResult, GroovyPsiElement place) {
final PsiElement element = methodResolveResult.getElement();
if (!(element instanceof PsiMethod)) return true;
+ if (element instanceof GrBuilderMethod) return true;
final PsiMethod method = (PsiMethod)element;
PsiType[] argumentTypes = PsiUtil.getArgumentTypes(place, true);
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/unusedDef/UnusedDefInspection.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/unusedDef/UnusedDefInspection.java
index 2f450f234a6d..c6cec4247bfe 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/unusedDef/UnusedDefInspection.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/unusedDef/UnusedDefInspection.java
@@ -19,6 +19,7 @@ import com.intellij.codeInspection.ProblemHighlightType;
import com.intellij.codeInspection.ProblemsHolder;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiFile;
import com.intellij.psi.PsiReference;
import com.intellij.psi.impl.DebugUtil;
import com.intellij.psi.search.LocalSearchScope;
@@ -156,7 +157,10 @@ public class UnusedDefInspection extends GroovyLocalInspectionBase {
if (var != null) {
final GroovyPsiElement scope = getScope(var);
- LOG.assertTrue(scope != null, DebugUtil.psiToString(var.getContainingFile(), true, false));
+ if (scope == null) {
+ PsiFile file = var.getContainingFile();
+ LOG.error(file == null ? "no file???" : DebugUtil.psiToString(file, true, false));
+ }
return ReferencesSearch.search(var, new LocalSearchScope(scope)).forEach(new Processor() {
public boolean process(PsiReference ref) {
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/dsl/GroovyDslAnnotator.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/dsl/GroovyDslAnnotator.java
index bad1e095378a..7e8257080ba5 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/dsl/GroovyDslAnnotator.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/dsl/GroovyDslAnnotator.java
@@ -20,7 +20,9 @@ import com.intellij.codeInsight.intention.IntentionAction;
import com.intellij.lang.annotation.Annotation;
import com.intellij.lang.annotation.AnnotationHolder;
import com.intellij.lang.annotation.Annotator;
+import com.intellij.openapi.editor.Document;
import com.intellij.openapi.editor.Editor;
+import com.intellij.openapi.fileEditor.FileDocumentManager;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.PsiElement;
@@ -37,7 +39,9 @@ public class GroovyDslAnnotator implements Annotator {
public void annotate(@NotNull PsiElement psiElement, @NotNull AnnotationHolder holder) {
if (psiElement instanceof GroovyFile) {
final VirtualFile vfile = ((GroovyFile)psiElement).getVirtualFile();
- if (vfile != null && "gdsl".equals(vfile.getExtension()) && !GroovyDslFileIndex.isActivated(vfile)) {
+ Document document = ((GroovyFile)psiElement).getViewProvider().getDocument();
+ if (vfile != null && "gdsl".equals(vfile.getExtension()) &&
+ (!GroovyDslFileIndex.isActivated(vfile) || document != null && FileDocumentManager.getInstance().isDocumentUnsaved(document))) {
final Annotation annotation = holder.createWarningAnnotation(psiElement, "DSL descriptor file has been changed and isn't currently executed. Click to activate it back.");
annotation.setFileLevelAnnotation(true);
annotation.registerFix(new IntentionAction() {
@@ -56,6 +60,7 @@ public class GroovyDslAnnotator implements Annotator {
}
public void invoke(@NotNull Project project, Editor editor, PsiFile file) throws IncorrectOperationException {
+ FileDocumentManager.getInstance().saveAllDocuments();
GroovyDslFileIndex.activateUntilModification(vfile);
DaemonCodeAnalyzer.getInstance(project).restart();
}
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/dsl/GroovyDslFileIndex.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/dsl/GroovyDslFileIndex.java
index 5503749886c1..1808a78ff35a 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/dsl/GroovyDslFileIndex.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/dsl/GroovyDslFileIndex.java
@@ -22,10 +22,7 @@ import com.intellij.notification.Notifications;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.ex.ApplicationManagerEx;
import com.intellij.openapi.diagnostic.Logger;
-import com.intellij.openapi.editor.Document;
-import com.intellij.openapi.editor.event.DocumentAdapter;
-import com.intellij.openapi.editor.event.DocumentEvent;
-import com.intellij.openapi.fileEditor.FileDocumentManager;
+import com.intellij.openapi.fileEditor.impl.LoadTextUtil;
import com.intellij.openapi.progress.ProgressManager;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.project.ProjectManager;
@@ -34,6 +31,9 @@ import com.intellij.openapi.roots.ProjectRootManager;
import com.intellij.openapi.util.Key;
import com.intellij.openapi.util.Pair;
import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.openapi.vfs.VirtualFileAdapter;
+import com.intellij.openapi.vfs.VirtualFileEvent;
+import com.intellij.openapi.vfs.VirtualFileManager;
import com.intellij.openapi.vfs.newvfs.FileAttribute;
import com.intellij.psi.*;
import com.intellij.psi.impl.PsiModificationTrackerImpl;
@@ -93,6 +93,19 @@ public class GroovyDslFileIndex extends ScalarIndexExtension {
private final EnumeratorStringDescriptor myKeyDescriptor = new EnumeratorStringDescriptor();
private static final byte[] ENABLED_FLAG = new byte[]{(byte)239};
+ public GroovyDslFileIndex() {
+ VirtualFileManager.getInstance().addVirtualFileListener(new VirtualFileAdapter() {
+
+ @Override
+ public void contentsChanged(VirtualFileEvent event) {
+ if (event.getFileName().endsWith(".gdsl")) {
+ disableFile(event.getFile());
+ }
+ }
+
+ });
+ }
+
public ID getName() {
return NAME;
}
@@ -132,17 +145,6 @@ public class GroovyDslFileIndex extends ScalarIndexExtension {
}
public static void activateUntilModification(final VirtualFile vfile) {
- final Document document = FileDocumentManager.getInstance().getDocument(vfile);
- if (document != null) {
- document.addDocumentListener(new DocumentAdapter() {
- @Override
- public void beforeDocumentChange(DocumentEvent e) {
- disableFile(vfile);
- document.removeDocumentListener(this);
- }
- });
- }
-
try {
ENABLED.writeAttributeBytes(vfile, ENABLED_FLAG);
}
@@ -237,15 +239,10 @@ public class GroovyDslFileIndex extends ScalarIndexExtension {
}
}
- final PsiFile psiFile = PsiManager.getInstance(project).findFile(vfile);
- if (psiFile == null) {
- continue;
- }
-
final long stamp = vfile.getModificationStamp();
final GroovyDslExecutor cached = getCachedExecutor(vfile, stamp);
if (cached == null) {
- scheduleParsing(queue, project, vfile, stamp, psiFile.getText());
+ scheduleParsing(queue, project, vfile, stamp, LoadTextUtil.loadText(vfile).toString());
count++;
}
else {
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/dsl/GroovyDslScript.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/dsl/GroovyDslScript.java
index b93db88b18c4..66172a113465 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/dsl/GroovyDslScript.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/dsl/GroovyDslScript.java
@@ -115,4 +115,8 @@ public class GroovyDslScript {
return false;
}
+ @Override
+ public String toString() {
+ return "GroovyDslScript: " + file.getPath();
+ }
}
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/gant/GantClassFinder.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/gant/GantClassFinder.java
index 4496fb1afa95..6d2e0105aac3 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/gant/GantClassFinder.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/gant/GantClassFinder.java
@@ -33,7 +33,7 @@ public class GantClassFinder extends NonClasspathClassFinder {
}
@Override
- protected List getClassRoots() {
+ protected List calcClassRoots() {
return mySettings.getClassRoots();
}
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/gant/GantSettings.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/gant/GantSettings.java
index e2f46ad52ccb..2af617fd06d5 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/gant/GantSettings.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/gant/GantSettings.java
@@ -33,6 +33,9 @@ import org.jetbrains.plugins.groovy.util.SdkHomeSettings;
}
)
public class GantSettings extends SdkHomeSettings {
+ public GantSettings(Project project) {
+ super(project);
+ }
public static GantSettings getInstance(Project project) {
return ServiceManager.getService(project, GantSettings.class);
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/gradle/GradleClassFinder.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/gradle/GradleClassFinder.java
index d30ec8b12fc6..39b3168b0322 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/gradle/GradleClassFinder.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/gradle/GradleClassFinder.java
@@ -34,7 +34,7 @@ public class GradleClassFinder extends NonClasspathClassFinder {
}
@Override
- protected List getClassRoots() {
+ protected List calcClassRoots() {
return mySettings.getClassRoots();
}
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/gradle/GradleSettings.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/gradle/GradleSettings.java
index 15f8b7e5f29f..d897bf33dca4 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/gradle/GradleSettings.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/gradle/GradleSettings.java
@@ -33,6 +33,9 @@ import org.jetbrains.plugins.groovy.util.SdkHomeSettings;
}
)
public class GradleSettings extends SdkHomeSettings {
+ public GradleSettings(Project project) {
+ super(project);
+ }
public static GradleSettings getInstance(Project project) {
return ServiceManager.getService(project, GradleSettings.class);
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/folding/GroovyFoldingBuilder.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/folding/GroovyFoldingBuilder.java
index cb379094cf92..740e5e067557 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/folding/GroovyFoldingBuilder.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/folding/GroovyFoldingBuilder.java
@@ -237,7 +237,7 @@ public class GroovyFoldingBuilder implements FoldingBuilder, GroovyElementTypes,
}
if (node.getElementType() == CLOSABLE_BLOCK) {
- return settings.isCollapseLambdas();
+ return settings.isCollapseAnonymousClasses();
}
if (node.getElementType() == CLASS_BODY) {
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/rename/GrLightElementRenamer.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/rename/GrLightElementRenamer.java
index 61f9ef039a05..f8642041bda3 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/rename/GrLightElementRenamer.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/rename/GrLightElementRenamer.java
@@ -22,6 +22,7 @@ import com.intellij.psi.impl.light.LightElement;
import com.intellij.refactoring.RefactoringBundle;
import com.intellij.refactoring.rename.RenamePsiElementProcessor;
import com.intellij.refactoring.util.CommonRefactoringUtil;
+import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.plugins.groovy.GroovyFileType;
import org.jetbrains.plugins.groovy.refactoring.GroovyRefactoringBundle;
@@ -40,7 +41,7 @@ public class GrLightElementRenamer extends RenamePsiElementProcessor {
}
@Override
- public boolean canProcessElement(@Nullable PsiElement element) {
+ public boolean canProcessElement(@NotNull PsiElement element) {
if (!(element instanceof LightElement)) return false;
final Language language = element.getLanguage();
return GroovyFileType.GROOVY_LANGUAGE.equals(language);
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/rename/RenameAliasImportedClassProcessor.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/rename/RenameAliasImportedClassProcessor.java
index d3a9e4319ef9..372baa83ea43 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/rename/RenameAliasImportedClassProcessor.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/rename/RenameAliasImportedClassProcessor.java
@@ -28,8 +28,8 @@ import java.util.Collection;
*/
public class RenameAliasImportedClassProcessor extends RenameJavaClassProcessor {
@Override
- public boolean canProcessElement(PsiElement element) {
- return super.canProcessElement(element) && element instanceof GroovyPsiElement;
+ public boolean canProcessElement(@NotNull PsiElement element) {
+ return element instanceof GroovyPsiElement && super.canProcessElement(element);
}
@NotNull
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/rename/RenameAliasImportedFieldProcessor.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/rename/RenameAliasImportedFieldProcessor.java
index 3ddc4836d9df..3cd416459bd3 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/rename/RenameAliasImportedFieldProcessor.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/rename/RenameAliasImportedFieldProcessor.java
@@ -28,7 +28,7 @@ import java.util.Collection;
*/
public class RenameAliasImportedFieldProcessor extends RenameJavaVariableProcessor{
@Override
- public boolean canProcessElement(PsiElement element) {
+ public boolean canProcessElement(@NotNull PsiElement element) {
return element instanceof GrField && !((GrField)element).isProperty();
}
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/rename/RenameAliasImportedMethodProcessor.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/rename/RenameAliasImportedMethodProcessor.java
index 5e2df617fa1b..5eb9492e4514 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/rename/RenameAliasImportedMethodProcessor.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/rename/RenameAliasImportedMethodProcessor.java
@@ -28,8 +28,8 @@ import java.util.Collection;
*/
public class RenameAliasImportedMethodProcessor extends RenameJavaMethodProcessor {
@Override
- public boolean canProcessElement(PsiElement element) {
- return super.canProcessElement(element) && element instanceof GroovyPsiElement;
+ public boolean canProcessElement(@NotNull PsiElement element) {
+ return element instanceof GroovyPsiElement && super.canProcessElement(element);
}
@NotNull
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/rename/RenameGroovyPropertyProcessor.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/rename/RenameGroovyPropertyProcessor.java
index 252b18195cdd..6ee5ee9a3bf9 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/rename/RenameGroovyPropertyProcessor.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/rename/RenameGroovyPropertyProcessor.java
@@ -190,7 +190,7 @@ public class RenameGroovyPropertyProcessor extends RenameJavaVariableProcessor {
}
@Override
- public boolean canProcessElement(final PsiElement element) {
+ public boolean canProcessElement(@NotNull final PsiElement element) {
return element instanceof GrField && ((GrField)element).isProperty();
}
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/util/SdkHomeSettings.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/util/SdkHomeSettings.java
index 2ec1dd20b9af..22302709e669 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/util/SdkHomeSettings.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/util/SdkHomeSettings.java
@@ -16,11 +16,14 @@
package org.jetbrains.plugins.groovy.util;
+import com.intellij.openapi.components.PersistentStateComponent;
+import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vfs.JarFileSystem;
import com.intellij.openapi.vfs.LocalFileSystem;
import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.openapi.components.PersistentStateComponent;
+import com.intellij.psi.PsiManager;
+import com.intellij.psi.impl.PsiModificationTrackerImpl;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.Nullable;
@@ -32,9 +35,12 @@ import java.util.List;
* @author peter
*/
public abstract class SdkHomeSettings implements PersistentStateComponent {
+ private final PsiModificationTrackerImpl myTracker;
private SdkHomeConfigurable.SdkHomeBean mySdkPath;
- private volatile VirtualFile mySdkHome;
- private volatile List myClassRoots;
+
+ protected SdkHomeSettings(Project project) {
+ myTracker = (PsiModificationTrackerImpl)PsiManager.getInstance(project).getModificationTracker();
+ }
public SdkHomeConfigurable.SdkHomeBean getState() {
return mySdkPath;
@@ -42,16 +48,7 @@ public abstract class SdkHomeSettings implements PersistentStateComponent getClassRoots() {
- if (myClassRoots == null) {
- calculateRoots();
- }
- return myClassRoots;
+ return calcRoots(getSdkHome());
}
private static List calcRoots(@Nullable VirtualFile home) {
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/gant/GantReferenceCompletionTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/gant/GantReferenceCompletionTest.groovy
index ebb97fead944..82c4f481a280 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/gant/GantReferenceCompletionTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/gant/GantReferenceCompletionTest.groovy
@@ -164,10 +164,10 @@ target (default : '') {
myFixture.configureByText "a.gant", """
target (default : '') {
- echo(new FileInputStream())
echo("hello2")
echo(message: 'Echo task.')
ant.fail('Failure reason')
+ ant.junit(fork:'yes') {}
}"""
myFixture.checkHighlighting(true, false, false)
}
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/introduceParameter/IntroduceParameterTest.java b/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/introduceParameter/IntroduceParameterTest.java
index 82ead2c02a9f..2a5f58f23970 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/introduceParameter/IntroduceParameterTest.java
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/introduceParameter/IntroduceParameterTest.java
@@ -97,7 +97,7 @@ public class IntroduceParameterTest extends LightCodeInsightFixtureTestCase {
}
PsiExpression initializer = (expr == null) ? localVariable.getInitializer() : expr;
- TIntArrayList parametersToRemove = removeUnusedParameters ? Util.findParametersToRemove(method, initializer) : new TIntArrayList();
+ TIntArrayList parametersToRemove = removeUnusedParameters ? Util.findParametersToRemove(method, initializer, null) : new TIntArrayList();
final Project project = myFixture.getProject();
final IntroduceParameterProcessor processor =
new IntroduceParameterProcessor(project, method, methodToSearchFor, initializer, expr, localVariable, true, parameterName,
diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/HgVcs.java b/plugins/hg4idea/src/org/zmlx/hg4idea/HgVcs.java
index 8bcd946412d3..0c455674b76a 100644
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/HgVcs.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/HgVcs.java
@@ -25,11 +25,7 @@ import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Disposer;
import com.intellij.openapi.util.IconLoader;
import com.intellij.openapi.util.SystemInfo;
-import com.intellij.openapi.vcs.AbstractVcs;
-import com.intellij.openapi.vcs.CommittedChangesProvider;
-import com.intellij.openapi.vcs.ProjectLevelVcsManager;
-import com.intellij.openapi.vcs.RepositoryChangeListener;
-import com.intellij.openapi.vcs.VcsException;
+import com.intellij.openapi.vcs.*;
import com.intellij.openapi.vcs.annotate.AnnotationProvider;
import com.intellij.openapi.vcs.changes.ChangeProvider;
import com.intellij.openapi.vcs.checkin.CheckinEnvironment;
@@ -48,12 +44,7 @@ import com.intellij.util.containers.Convertor;
import com.intellij.util.messages.MessageBusConnection;
import com.intellij.util.messages.Topic;
import org.jetbrains.annotations.Nullable;
-import org.zmlx.hg4idea.provider.HgCachingCommitedChangesProvider;
-import org.zmlx.hg4idea.provider.HgChangeProvider;
-import org.zmlx.hg4idea.provider.HgDiffProvider;
-import org.zmlx.hg4idea.provider.HgHistoryProvider;
-import org.zmlx.hg4idea.provider.HgMergeProvider;
-import org.zmlx.hg4idea.provider.HgRollbackEnvironment;
+import org.zmlx.hg4idea.provider.*;
import org.zmlx.hg4idea.provider.annotate.HgAnnotationProvider;
import org.zmlx.hg4idea.provider.commit.HgCheckinEnvironment;
import org.zmlx.hg4idea.provider.update.HgIntegrateEnvironment;
@@ -61,7 +52,7 @@ import org.zmlx.hg4idea.provider.update.HgUpdateEnvironment;
import org.zmlx.hg4idea.ui.HgChangesetStatus;
import org.zmlx.hg4idea.ui.HgCurrentBranchStatus;
-import javax.swing.Icon;
+import javax.swing.*;
import java.io.File;
import java.util.Collections;
import java.util.List;
@@ -152,8 +143,9 @@ public class HgVcs extends AbstractVcs {
return changeProvider;
}
+ @Nullable
@Override
- public RollbackEnvironment getRollbackEnvironment() {
+ public RollbackEnvironment createRollbackEnvironment() {
if (!started) {
return null;
}
@@ -184,8 +176,9 @@ public class HgVcs extends AbstractVcs {
return getVcsHistoryProvider();
}
+ @Nullable
@Override
- public CheckinEnvironment getCheckinEnvironment() {
+ public CheckinEnvironment createCheckinEnvironment() {
if (!started) {
return null;
}
@@ -207,8 +200,9 @@ public class HgVcs extends AbstractVcs {
return myMergeProvider;
}
+ @Nullable
@Override
- public UpdateEnvironment getUpdateEnvironment() {
+ public UpdateEnvironment createUpdateEnvironment() {
if (!started) {
return null;
}
diff --git a/plugins/junit/src/com/intellij/execution/junit2/ui/StatisticsPanel.java b/plugins/junit/src/com/intellij/execution/junit2/ui/StatisticsPanel.java
index 774cea6a883b..990105589d1e 100644
--- a/plugins/junit/src/com/intellij/execution/junit2/ui/StatisticsPanel.java
+++ b/plugins/junit/src/com/intellij/execution/junit2/ui/StatisticsPanel.java
@@ -79,9 +79,9 @@ class StatisticsPanel extends JPanel implements DataProvider{
private void updateStatistics() {
myTable.setVisible(true);
// myTestCaseInfo.setVisible(false);
- TestProxy proxy = myCurrentTest;
- if (myCurrentTest.isLeaf() && myCurrentTest.getParent() != null) {
- proxy = myCurrentTest.getParent();
+ TestProxy proxy = myCurrentTest != null ? myCurrentTest : myModel.getRoot();
+ if (proxy.isLeaf() && proxy.getParent() != null) {
+ proxy = proxy.getParent();
}
myChildInfo.updateStatistics(proxy);
myTotalLabel.clear();
@@ -113,7 +113,10 @@ class StatisticsPanel extends JPanel implements DataProvider{
private class MyJUnitListener extends JUnitAdapter {
public void onTestChanged(final TestEvent event) {
if (!StatisticsPanel.this.isShowing()) return;
- if (myCurrentTest == event.getSource()) updateStatistics();
+ final TestProxy source = event.getSource();
+ if (myCurrentTest == source || myCurrentTest == null && source == myModel.getRoot()) {
+ updateStatistics();
+ }
}
public void onTestSelected(final TestProxy test) {
diff --git a/plugins/properties/src/com/intellij/refactoring/rename/RenamePropertyProcessor.java b/plugins/properties/src/com/intellij/refactoring/rename/RenamePropertyProcessor.java
index be365ce93429..7cc026a1e31e 100644
--- a/plugins/properties/src/com/intellij/refactoring/rename/RenamePropertyProcessor.java
+++ b/plugins/properties/src/com/intellij/refactoring/rename/RenamePropertyProcessor.java
@@ -19,12 +19,13 @@ import com.intellij.lang.properties.PropertiesUtil;
import com.intellij.lang.properties.ResourceBundle;
import com.intellij.lang.properties.psi.Property;
import com.intellij.psi.PsiElement;
+import org.jetbrains.annotations.NotNull;
import java.util.List;
import java.util.Map;
public class RenamePropertyProcessor extends RenamePsiElementProcessor {
- public boolean canProcessElement(final PsiElement element) {
+ public boolean canProcessElement(@NotNull final PsiElement element) {
return element instanceof Property;
}
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnVcs.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnVcs.java
index eb6e79d17d56..975724077a6f 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnVcs.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnVcs.java
@@ -591,7 +591,7 @@ public class SvnVcs extends AbstractVcs