MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-08 15:09:39 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git@git.labs.intellij.net:idea/community

Browse Source
This commit is contained in:
Kirill Kalishev
2011-05-18 14:41:36 +04:00
parent 478711c0b9 e18f86d38d
commit 279a863e07
5 changed files with 71 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
platform/platform-api/src/com/intellij/openapi/project/ProjectManager.java
View File

@@ -79,6 +79,7 @@ public abstract class ProjectManager {
/**
* Returns the project which is used as a template for new projects. The template project
* is always available, even when no other project is open.
* NB: default project can be lazy loaded
*
* @return the template project instance.
*/

72
plugins/InspectionGadgets/src/com/siyeh/ig/bugs/MismatchedStringBuilderQueryUpdateInspection.java
View File

@@ -47,7 +47,7 @@ public class MismatchedStringBuilderQueryUpdateInspection
@Override
@NotNull
public String getID(){
public String getID() {
return "MismatchedQueryAndUpdateOfStringBuilder";
}
@@ -64,11 +64,11 @@ public class MismatchedStringBuilderQueryUpdateInspection
protected String buildErrorString(Object... infos) {
final boolean updated = ((Boolean)infos[0]).booleanValue();
final PsiType type = (PsiType)infos[1]; //"StringBuilder";
if(updated){
if (updated) {
return InspectionGadgetsBundle.message(
"mismatched.string.builder.updated.problem.descriptor",
type.getPresentableText());
} else{
} else {
return InspectionGadgetsBundle.message(
"mismatched.string.builder.queried.problem.descriptor",
type.getPresentableText());
@@ -135,20 +135,20 @@ public class MismatchedStringBuilderQueryUpdateInspection
private static boolean checkVariable(PsiVariable variable,
PsiElement context) {
if(context == null){
if (context == null) {
return false;
}
if (!TypeUtils.variableHasTypeOrSubtype(variable,
"java.lang.AbstractStringBuilder")) {
return false;
}
if(VariableAccessUtils.variableIsAssigned(variable, context)){
if (VariableAccessUtils.variableIsAssigned(variable, context)) {
return false;
}
if(VariableAccessUtils.variableIsAssignedFrom(variable, context)){
if (VariableAccessUtils.variableIsAssignedFrom(variable, context)) {
return false;
}
if(VariableAccessUtils.variableIsReturned(variable, context)){
if (VariableAccessUtils.variableIsReturned(variable, context)) {
return false;
}
if (VariableAccessUtils.variableIsPassedAsMethodArgument(variable,
@@ -298,6 +298,18 @@ public class MismatchedStringBuilderQueryUpdateInspection
queryNames.add("substring");
}
@NonNls
private static final Set<String> returnThisNames = new HashSet();
static {
returnThisNames.add("append");
returnThisNames.add("appendCodePoint");
returnThisNames.add("delete");
returnThisNames.add("delete");
returnThisNames.add("deleteCharAt");
returnThisNames.add("insert");
returnThisNames.add("replace");
}
private final PsiVariable variable;
private boolean queried = false;
@@ -309,7 +321,7 @@ public class MismatchedStringBuilderQueryUpdateInspection
return queried;
}
@Override public void visitElement(@NotNull PsiElement element){
@Override public void visitElement(@NotNull PsiElement element) {
if (queried) {
return;
}
@@ -326,17 +338,55 @@ public class MismatchedStringBuilderQueryUpdateInspection
final PsiReferenceExpression methodExpression =
expression.getMethodExpression();
final String name = methodExpression.getReferenceName();
if (!queryNames.contains(name)) {
return;
}
final PsiExpression qualifierExpression =
methodExpression.getQualifierExpression();
if (!queryNames.contains(name)) {
if (returnThisNames.contains(name) &&
hasReferenceToVariable(variable, qualifierExpression) &&
isVariableValueUsed(expression)) {
queried = true;
}
return;
}
if (hasReferenceToVariable(variable, qualifierExpression)) {
queried = true;
}
}
}
private static boolean isVariableValueUsed(
PsiExpression expression) {
final PsiElement parent = expression.getParent();
if (parent instanceof PsiParenthesizedExpression) {
final PsiParenthesizedExpression parenthesizedExpression =
(PsiParenthesizedExpression) parent;
return isVariableValueUsed(parenthesizedExpression);
} else if (parent instanceof PsiTypeCastExpression) {
final PsiTypeCastExpression typeCastExpression =
(PsiTypeCastExpression) parent;
return isVariableValueUsed(typeCastExpression);
} else if (parent instanceof PsiReturnStatement) {
return true;
} else if (parent instanceof PsiExpressionList) {
final PsiElement grandParent = parent.getParent();
if (grandParent instanceof PsiMethodCallExpression) {
return true;
}
} else if (parent instanceof PsiArrayInitializerExpression) {
return true;
} else if (parent instanceof PsiAssignmentExpression) {
final PsiAssignmentExpression assignmentExpression =
(PsiAssignmentExpression) parent;
final PsiExpression rhs = assignmentExpression.getRExpression();
return expression.equals(rhs);
} else if (parent instanceof PsiVariable) {
final PsiVariable variable = (PsiVariable) parent;
final PsiExpression initializer = variable.getInitializer();
return expression.equals(initializer);
}
return false;
}
private static boolean hasReferenceToVariable(PsiVariable variable,
PsiElement element) {
if (element instanceof PsiReferenceExpression) {

7
plugins/svn4idea/src/org/jetbrains/idea/svn/actions/ImportToRepositoryAction.java
View File

@@ -32,13 +32,10 @@ public class ImportToRepositoryAction extends AnAction implements DumbAware {
@Override
public void update(final AnActionEvent e) {
super.update(e);
Project project = e.getData(PlatformDataKeys.PROJECT);
if (project == null) {
project = ProjectManager.getInstance().getDefaultProject();
}
final Project project = e.getData(PlatformDataKeys.PROJECT);
final Presentation presentation = e.getPresentation();
presentation.setEnabled(presentation.isEnabled() &&
(! ProjectLevelVcsManager.getInstance(project).isBackgroundVcsOperationRunning()));
(project == null || (! ProjectLevelVcsManager.getInstance(project).isBackgroundVcsOperationRunning())));
}
public void actionPerformed(AnActionEvent e) {

7
plugins/svn4idea/src/org/jetbrains/idea/svn/actions/SelectBranchPopup.java
View File

@@ -244,7 +244,12 @@ public class SelectBranchPopup {
.setItemChoosenCallback(new Runnable() {
public void run() {
if (REFRESH_MESSAGE.equals(branchList.getSelectedValue())) {
showBranchPopup(selectedValue, false);
SwingUtilities.invokeLater(new Runnable() {
@Override
public void run() {
showBranchPopup(selectedValue, false);
}
});
return;
}
SvnBranchItem item = (SvnBranchItem)branchList.getSelectedValue();

12
plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/SvnInteractiveAuthenticationProvider.java
View File

@@ -20,7 +20,6 @@ import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.ui.MessageType;
import com.intellij.openapi.vcs.ui.VcsBalloonProblemNotifier;
import com.intellij.ui.GuiUtils;
import com.intellij.util.SystemProperties;
import com.intellij.util.WaitForProgressToShow;
import org.jetbrains.idea.svn.SvnAuthenticationManager;
@@ -33,7 +32,6 @@ import org.tmatesoft.svn.core.SVNURL;
import org.tmatesoft.svn.core.auth.*;
import java.io.File;
import java.lang.reflect.InvocationTargetException;
import java.security.cert.X509Certificate;
public class SvnInteractiveAuthenticationProvider implements ISVNAuthenticationProvider {
@@ -202,15 +200,7 @@ public class SvnInteractiveAuthenticationProvider implements ISVNAuthenticationP
MessageType.ERROR);
return REJECTED;
}
try {
GuiUtils.runOrInvokeAndWait(command);
}
catch (InterruptedException e) {
//
}
catch (InvocationTargetException e) {
//
}
WaitForProgressToShow.runOrInvokeAndWaitAboveProgress(command);
return result[0];
}