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:
Konstantin Bulenkov
2014-11-06 15:14:24 +01:00
parent 4e66e187f8 30e02887f7
commit dc6e69073e
6 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/XDebuggerEditorBase.java
+2 -2
View File
@@ -142,7 +142,7 @@ public abstract class XDebuggerEditorBase {
public abstract JComponent getComponent();
protected abstract void setEditorText(XExpression text);
protected abstract void doSetText(XExpression text);
public void setExpression(@Nullable XExpression text) {
if (text == null) {
@@ -174,7 +174,7 @@ public abstract class XDebuggerEditorBase {
myChooseFactory.setDisabledIcon(IconLoader.getDisabledIcon(icon));
}
setEditorText(text);
doSetText(text);
}
@Nullable
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/XDebuggerExpressionComboBox.java
+1 -1
View File
@@ -128,7 +128,7 @@ public class XDebuggerExpressionComboBox extends XDebuggerEditorBase {
}
@Override
protected void setEditorText(XExpression text) {
protected void doSetText(XExpression text) {
if (myComboBox.getItemCount() > 0) {
myComboBox.setSelectedIndex(0);
}
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/XDebuggerMultilineEditor.java
+1 -1
View File
@@ -69,7 +69,7 @@ public class XDebuggerMultilineEditor extends XDebuggerEditorBase {
}
@Override
protected void setEditorText(XExpression text) {
protected void doSetText(XExpression text) {
myExpression = text;
Language language = text.getLanguage();
FileType fileType = language != null ? language.getAssociatedFileType() : getEditorsProvider().getFileType();
python/edu/build/pycharm_edu_build.gant
+5 -2
View File
@@ -144,8 +144,11 @@ target('default': "Build artifacts") {
layoutEducational("${paths.sandbox}/classes/production", usedJars)
def extraArgs = ["build.code": "pycharm${buildName}", "build.number": "PE-$buildNumber", "artifacts.path": "${paths.artifacts}"]
signMacZip("pycharm", extraArgs)
notifyArtifactBuilt("${paths.artifacts}/pycharm${buildName}.sit")
buildDmg("pycharm", "${pythonEduHome}/build/DMG_background.png", extraArgs)
signMacZip("pycharm", extraArgs + ["sitFileName": "pycharm${buildName}-jdk-bundled", "jdk_archive_name": "jdk_mac_redist_for_${buildNumber}.tar"])
buildDmg("pycharm", "${pythonEduHome}/build/DMG_background.png", extraArgs + ["sitFileName": "pycharm${buildName}-jdk-bundled", "jdk_archive_name": "jdk_mac_redist_for_${buildNumber}.tar"])
@@ -206,7 +209,7 @@ public layoutEducational(String classesPath, Set usedJars) {
String macAppRoot = isEap() ? "PyCharm Educational ${p("component.version.major")}.${p("component.version.minor")} EAP.app/Contents" : "PyCharm Educational.app/Contents"
buildMacZip(macAppRoot, "${paths.artifacts}/pycharm${buildName}.sit", [paths.distAll], paths.distMac)
ant.copy(file: "${paths.artifacts}/pycharm${buildName}.sit", tofile: "${paths.artifacts}/pycharm${buildName}-jdk-bundled.sit")
ant.delete(file: "${paths.artifacts}/pycharm${buildName}.sit")
//ant.delete(file: "${paths.artifacts}/pycharm${buildName}.sit")
}
private layoutPlugins(layouts) {
python/src/com/jetbrains/python/debugger/array/ArrayTableCellEditor.java
+1 -1
View File
@@ -143,7 +143,7 @@ public class ArrayTableCellEditor extends AbstractCellEditor implements TableCel
}
@Override
protected void setEditorText(XExpression text) {
protected void doSetText(XExpression text) {
myEditorTextField.setText(text.getExpression());
}
python/src/com/jetbrains/python/refactoring/rename/RenamePyClassProcessor.java
+2 -1
View File
@@ -17,6 +17,7 @@ package com.jetbrains.python.refactoring.rename;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiReference;
import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.psi.search.searches.ReferencesSearch;
import com.intellij.util.Processor;
import com.jetbrains.python.PyNames;
@@ -67,7 +68,7 @@ public class RenamePyClassProcessor extends RenamePyElementProcessor {
if (initMethod != null) {
final List<PsiReference> allRefs = Collections.synchronizedList(new ArrayList<PsiReference>());
allRefs.addAll(super.findReferences(element));
ReferencesSearch.search(initMethod).forEach(new Processor<PsiReference>() {
ReferencesSearch.search(initMethod, GlobalSearchScope.projectScope(element.getProject())).forEach(new Processor<PsiReference>() {
@Override
public boolean process(PsiReference psiReference) {
if (psiReference.getCanonicalText().equals(((PyClass)element).getName())) {