MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Alexander Lobas
2012-03-28 14:00:03 +04:00
parent ed86e618f3 2787edf2ec
commit 878bce02db
10 changed files with 34 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateConstructorMatchingSuperFix.java
+3 -1
View File
@@ -29,6 +29,7 @@ import com.intellij.openapi.editor.ScrollType;
import com.intellij.openapi.project.Project;
import com.intellij.psi.*;
import com.intellij.psi.codeStyle.CodeStyleManager;
import com.intellij.psi.codeStyle.JavaCodeStyleManager;
import com.intellij.psi.javadoc.PsiDocComment;
import com.intellij.psi.util.PsiUtil;
import com.intellij.psi.util.TypeConversionUtil;
@@ -147,7 +148,8 @@ public class CreateConstructorMatchingSuperFix extends BaseIntentionAction {
derived.getBody().replace(stub.getBody());
derived = (PsiMethod)reformatter.reformat(derived);
derived = (PsiMethod)targetClass.add(derived);
derived = (PsiMethod)JavaCodeStyleManager.getInstance(project).shortenClassReferences(derived);
derived = (PsiMethod)GenerateMembersUtil.insert(targetClass, derived, null, true);
}
if (derived != null) {
editor.getCaretModel().moveToOffset(derived.getTextRange().getStartOffset());
java/java-impl/src/com/intellij/refactoring/introduceVariable/JavaVariableInplaceIntroducer.java
+1 -1
View File
@@ -194,7 +194,7 @@ public class JavaVariableInplaceIntroducer extends InplaceVariableIntroducer<Psi
.restoreExpression(containingFile, (PsiVariable)vars[0], elementFactory, occurrenceMarker, myExpressionText);
}
final PsiExpression initializer = ((PsiVariable)vars[0]).getInitializer();
if (initializer != null && Comparing.strEqual(initializer.getText(), myExpressionText)) {
if (initializer != null && Comparing.strEqual(initializer.getText(), myExpressionText) && myExpr == null) {
element.replace(JavaPsiFacade.getInstance(myProject).getElementFactory().createStatementFromText(myExpressionText, element));
} else {
element.delete();
platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleSchemesPanel.java
+6 -1
View File
@@ -115,7 +115,12 @@ public class CodeStyleSchemesPanel{
schemes.addAll(myModel.getAllSortedSchemes());
DefaultComboBoxModel model = new DefaultComboBoxModel(schemes.toArray());
myCombo.setModel(model);
myCombo.setSelectedItem(myModel.getSelectedGlobalScheme());
if (myModel.isUsePerProjectSettings()) {
myCombo.setSelectedItem(myModel.getProjectScheme());
}
else {
myCombo.setSelectedItem(myModel.getSelectedGlobalScheme());
}
}
finally {
myIsReset = false;
platform/lang-impl/src/com/intellij/ide/scopeView/ScopeTreeViewPanel.java
+1
View File
@@ -431,6 +431,7 @@ public class ScopeTreeViewPanel extends JPanel implements Disposable {
final boolean wasCollapsed = myTree.isCollapsed(path);
final Runnable runnable = new Runnable() {
public void run() {
if (!isTreeShowing() || rootToReload.getParent() == null) return;
TreeUtil.sort(rootToReload, getNodeComparator());
treeModel.reload(rootToReload);
if (!wasCollapsed) {
platform/lang-impl/src/com/intellij/ide/util/scopeChooser/ScopeChooserConfigurable.java
+1 -2
View File
@@ -21,7 +21,6 @@ import com.intellij.execution.ExecutionBundle;
import com.intellij.ide.IdeBundle;
import com.intellij.openapi.actionSystem.*;
import com.intellij.openapi.options.ConfigurationException;
import com.intellij.openapi.options.NonDefaultProjectConfigurable;
import com.intellij.openapi.options.SearchableConfigurable;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.project.ProjectBundle;
@@ -56,7 +55,7 @@ import java.util.*;
* User: anna
* Date: 01-Jul-2006
*/
public class ScopeChooserConfigurable extends MasterDetailsComponent implements NonDefaultProjectConfigurable, SearchableConfigurable {
public class ScopeChooserConfigurable extends MasterDetailsComponent implements /*NonDefaultProjectConfigurable,*/ SearchableConfigurable {
private static final Icon SCOPES = IconLoader.getIcon("/ide/scopeConfigurable.png");
private static final Icon SAVE_ICON = IconLoader.getIcon("/runConfigurations/saveTempConfig.png");
@NonNls public static final String SCOPE_CHOOSER_CONFIGURABLE_UI_KEY = "ScopeChooserConfigurable.UI";
platform/lang-impl/src/com/intellij/refactoring/introduce/inplace/InplaceVariableIntroducer.java
+2
View File
@@ -26,6 +26,7 @@ import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.command.impl.StartMarkAction;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.editor.RangeMarker;
import com.intellij.openapi.editor.ScrollType;
import com.intellij.openapi.extensions.Extensions;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.ui.popup.Balloon;
@@ -202,6 +203,7 @@ public abstract class InplaceVariableIntroducer<E extends PsiElement> extends In
releaseIfNotRestart();
}
});
myEditor.getScrollingModel().scrollToCaret(ScrollType.MAKE_VISIBLE);
myBalloon.show(new PositionTracker<Balloon>(myEditor.getContentComponent()) {
@Override
public RelativePoint recalculateLocation(Balloon object) {
platform/platform-impl/src/com/intellij/ide/IdeTooltip.java
+11
View File
@@ -50,6 +50,8 @@ public class IdeTooltip extends ComparableObject.Impl {
private Ui myUi;
private boolean hint = false;
public IdeTooltip(Component component, Point point, JComponent tipComponent, Object... identity) {
super(identity);
@@ -232,6 +234,15 @@ public class IdeTooltip extends ComparableObject.Impl {
return myLayer;
}
public IdeTooltip setHint(boolean hint) {
this.hint = hint;
return this;
}
public boolean isHint() {
return hint;
}
public boolean isInside(RelativePoint target) {
return myUi != null && myUi.isInside(target);
}
platform/platform-impl/src/com/intellij/ide/IdeTooltipManager.java
+6 -1
View File
@@ -143,7 +143,12 @@ public class IdeTooltipManager implements ApplicationComponent, AWTEventListener
if (!myCurrentTipIsCentered) {
myX = me.getX();
myY = me.getY();
maybeShowFor(c, me);
if (c instanceof JComponent && ((JComponent)c).getToolTipText(me) == null && (myQueuedTooltip == null || !myQueuedTooltip.isHint())) {
hideCurrent(me, null, null);//There is no tooltip or hint here, let's proceed it as MOUSE_EXITED
}
else {
maybeShowFor(c, me);
}
}
}
}
platform/platform-impl/src/com/intellij/ui/LightweightHint.java
+2 -2
View File
@@ -166,8 +166,8 @@ public class LightweightHint extends UserDataHolderBase implements Hint {
.setFont(hintHint.getTextFont())
.setCalloutShift(hintHint.getCalloutShift())
.setPositionChangeShift(hintHint.getPositionChangeX(), hintHint.getPositionChangeY())
.setExplicitClose(hintHint.isExplicitClose());
.setExplicitClose(hintHint.isExplicitClose())
.setHint(true);
myComponent.validate();
myCurrentIdeTooltip = IdeTooltipManager.getInstance().show(tooltip, hintHint.isShowImmediately());
} else {
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/RemoteRevisionsNumbersCache.java
+1 -1
View File
@@ -301,7 +301,7 @@ public class RemoteRevisionsNumbersCache implements ChangesOnServerTracker {
if ((NOT_LOADED == remote) || (UNKNOWN == remote)) {
return true;
}
return local.compareTo(remote) == 0;
return local.compareTo(remote) >= 0;
}
return true;
}