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:
Dmitry Jemerov
2012-06-27 17:56:40 +02:00
parent 5dcb90789c f76cd1bf64
commit 2e281dfc53
5 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/model/src/org/jetbrains/ether/dependencyView/IntIntPersistentMultiMaplet.java
+1 -1
View File
@@ -78,7 +78,7 @@ class IntIntPersistentMultiMaplet extends IntIntMultiMaplet {
public void replace(int key, TIntHashSet value) {
try {
myCache.remove(key);
if (value == null || value.size() == 0) {
if (value == null || value.isEmpty()) {
myMap.remove(key);
}
else {
jps/model/src/org/jetbrains/ether/dependencyView/IntIntTransientMultiMaplet.java
+1 -1
View File
@@ -56,7 +56,7 @@ class IntIntTransientMultiMaplet extends IntIntMultiMaplet {
@Override
public void replace(int key, TIntHashSet value) {
if (value == null || value.size() == 0) {
if (value == null || value.isEmpty()) {
myMap.remove(key);
}
else {
jps/model/src/org/jetbrains/ether/dependencyView/IntObjectPersistentMultiMaplet.java
+1 -1
View File
@@ -83,7 +83,7 @@ class IntObjectPersistentMultiMaplet<V extends Streamable> extends IntObjectMult
public void replace(int key, Collection<V> value) {
try {
myCache.remove(key);
if (value == null) {
if (value == null || value.isEmpty()) {
myMap.remove(key);
}
else {
jps/model/src/org/jetbrains/ether/dependencyView/IntObjectTransientMultiMaplet.java
+1 -1
View File
@@ -55,7 +55,7 @@ class IntObjectTransientMultiMaplet<V extends Streamable> extends IntObjectMulti
@Override
public void replace(int key, Collection<V> value) {
if (value == null) {
if (value == null || value.isEmpty()) {
myMap.remove(key);
}
else {
platform/lang-impl/src/com/intellij/codeInsight/actions/ReformatCodeAction.java
+5 -3
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2011 JetBrains s.r.o.
* Copyright 2000-2012 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.
@@ -144,12 +144,14 @@ public class ReformatCodeAction extends AnAction implements DumbAware {
boolean optimizeImports = ReformatFilesDialog.isOptmizeImportsOptionOn();
boolean processWholeFile = false;
boolean processChangedTextOnly = false;
if (EditorSettingsExternalizable.getInstance().getOptions().SHOW_REFORMAT_DIALOG || (file == null && dir != null)) {
final boolean showDialog = EditorSettingsExternalizable.getInstance().getOptions().SHOW_REFORMAT_DIALOG;
if (showDialog || (file == null && dir != null)) {
final LayoutCodeDialog dialog = new LayoutCodeDialog(project, CodeInsightBundle.message("process.reformat.code"), file, dir,
hasSelection ? Boolean.TRUE : Boolean.FALSE, HELP_ID);
dialog.show();
if (!dialog.isOK()) return;
EditorSettingsExternalizable.getInstance().getOptions().SHOW_REFORMAT_DIALOG = !dialog.isDoNotAskMe();
final boolean showDialogAtFuture = dir == null ? !dialog.isDoNotAskMe() : processChangedTextOnly;
EditorSettingsExternalizable.getInstance().getOptions().SHOW_REFORMAT_DIALOG = showDialogAtFuture;
updateShowDialogSetting(dialog, "\"Reformat Code\" dialog disabled");
optimizeImports = dialog.isOptimizeImports();
processWholeFile = dialog.isProcessWholeFile();