diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/classpath/ClasspathPanelImpl.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/classpath/ClasspathPanelImpl.java
index 166bdfa5ccf0..5d1ea060a4e8 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/classpath/ClasspathPanelImpl.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/classpath/ClasspathPanelImpl.java
@@ -231,6 +231,7 @@ public class ClasspathPanelImpl extends JPanel implements ClasspathPanel {
navigateAction.registerCustomShortcutSet(ActionManager.getInstance().getAction(IdeActions.ACTION_EDIT_SOURCE).getShortcutSet(),
myEntryTable);
actionGroup.add(myEditButton);
+ actionGroup.add(myRemoveButton);
actionGroup.add(navigateAction);
actionGroup.add(new MyFindUsagesAction());
actionGroup.add(new AnalyzeDependencyAction());
diff --git a/java/java-impl/src/com/intellij/codeInspection/dataFlow/ControlFlowAnalyzer.java b/java/java-impl/src/com/intellij/codeInspection/dataFlow/ControlFlowAnalyzer.java
index c4eb8a206e2a..5edaf3d192d6 100644
--- a/java/java-impl/src/com/intellij/codeInspection/dataFlow/ControlFlowAnalyzer.java
+++ b/java/java-impl/src/com/intellij/codeInspection/dataFlow/ControlFlowAnalyzer.java
@@ -1094,15 +1094,13 @@ class ControlFlowAnalyzer extends JavaElementVisitor {
PsiExpression operand = operands[i];
operand.accept(this);
generateBoxingUnboxingInstructionFor(operand, exprType);
- PsiExpression nextOperand = i == operands.length - 1 ? null : operands[i + 1];
- if (nextOperand != null) {
- ConditionalGotoInstruction onFail = new ConditionalGotoInstruction(-1, true, operand);
- branchToFail.add(onFail);
- addInstruction(onFail);
- }
+ ConditionalGotoInstruction onFail = new ConditionalGotoInstruction(-1, true, operand);
+ branchToFail.add(onFail);
+ addInstruction(onFail);
}
+ addInstruction(new PushInstruction(myFactory.getConstFactory().getTrue(), null));
GotoInstruction toSuccess = new GotoInstruction(-1);
addInstruction(toSuccess);
PushInstruction pushFalse = new PushInstruction(myFactory.getConstFactory().getFalse(), null);
diff --git a/java/java-tests/testData/inspection/dataFlow/fixture/LastConstantConditionInAnd.java b/java/java-tests/testData/inspection/dataFlow/fixture/LastConstantConditionInAnd.java
new file mode 100644
index 000000000000..be27aa71b714
--- /dev/null
+++ b/java/java-tests/testData/inspection/dataFlow/fixture/LastConstantConditionInAnd.java
@@ -0,0 +1,14 @@
+class Fun {
+ private void parseDeclarator(Object builder, boolean isTuple) {
+ if (!isTuple) {
+ return;
+ }
+ else {
+ if (smth() && isTuple) {
+ System.out.println();
+ }
+ }
+ }
+
+ boolean smth() { return true; }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/inspection/dataFlow/unboxingNPE/expected.xml b/java/java-tests/testData/inspection/dataFlow/unboxingNPE/expected.xml
index b0d1a3312766..000168e3d991 100644
--- a/java/java-tests/testData/inspection/dataFlow/unboxingNPE/expected.xml
+++ b/java/java-tests/testData/inspection/dataFlow/unboxingNPE/expected.xml
@@ -375,4 +375,13 @@
Constant conditions & exceptions
Unboxing of <code>i</code> may produce <code>java.lang.NullPointerException</code>.
+
+
+ Test.java
+ 67
+ <default>
+ Constant conditions & exceptions
+ Condition <code>i</code> is always <code>true</code> when reached
+
+
diff --git a/java/java-tests/testSrc/com/intellij/codeInspection/DataFlowInspectionFixtureTest.java b/java/java-tests/testSrc/com/intellij/codeInspection/DataFlowInspectionFixtureTest.java
index 61f527ea101b..229e2768179b 100644
--- a/java/java-tests/testSrc/com/intellij/codeInspection/DataFlowInspectionFixtureTest.java
+++ b/java/java-tests/testSrc/com/intellij/codeInspection/DataFlowInspectionFixtureTest.java
@@ -138,5 +138,6 @@ public class DataFlowInspectionFixtureTest extends JavaCodeInsightFixtureTestCas
public void testMethodCallFlushesField() { doTest(); }
public void testUnknownFloatMayBeNaN() { doTest(); }
+ public void testLastConstantConditionInAnd() { doTest(); }
}
diff --git a/platform/platform-impl/src/com/intellij/internal/ToggleLaggingModeAction.java b/platform/platform-impl/src/com/intellij/internal/ToggleLaggingModeAction.java
index f2c1bedf295f..cc5ddf447c32 100644
--- a/platform/platform-impl/src/com/intellij/internal/ToggleLaggingModeAction.java
+++ b/platform/platform-impl/src/com/intellij/internal/ToggleLaggingModeAction.java
@@ -63,10 +63,10 @@ public class ToggleLaggingModeAction extends AnAction implements DumbAware {
final Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext());
presentation.setEnabled(project != null && myLagging == DumbServiceImpl.getInstance(project).isDumb());
if (myLagging) {
- presentation.setText("Exit dumb mode");
+ presentation.setText("Exit lagging mode");
}
else {
- presentation.setText("Enter dumb mode");
+ presentation.setText("Enter lagging mode");
}
}
}
diff --git a/platform/platform-resources/src/idea/PlatformActions.xml b/platform/platform-resources/src/idea/PlatformActions.xml
index 384b34caa276..c359fa41514f 100644
--- a/platform/platform-resources/src/idea/PlatformActions.xml
+++ b/platform/platform-resources/src/idea/PlatformActions.xml
@@ -536,28 +536,33 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
diff --git a/plugins/ant/jps-plugin/src/org/jetbrains/jps/ant/build/AntArtifactBuildTaskProvider.java b/plugins/ant/jps-plugin/src/org/jetbrains/jps/ant/build/AntArtifactBuildTaskProvider.java
index 6ad00a178c7f..d4a40b2c6734 100644
--- a/plugins/ant/jps-plugin/src/org/jetbrains/jps/ant/build/AntArtifactBuildTaskProvider.java
+++ b/plugins/ant/jps-plugin/src/org/jetbrains/jps/ant/build/AntArtifactBuildTaskProvider.java
@@ -66,7 +66,7 @@ public class AntArtifactBuildTaskProvider extends ArtifactBuildTaskProvider {
@Override
public List createArtifactBuildTasks(@NotNull JpsArtifact artifact, @NotNull ArtifactBuildPhase buildPhase) {
JpsAntArtifactExtension extension = getBuildExtension(artifact, buildPhase);
- if (extension != null && extension.isEnabled()) {
+ if (extension != null && extension.isEnabled() && !StringUtil.isEmpty(extension.getFileUrl())) {
return Collections.singletonList(new AntArtifactBuildTask(extension));
}
return Collections.emptyList();
@@ -155,7 +155,10 @@ public class AntArtifactBuildTaskProvider extends ArtifactBuildTaskProvider {
programParams.add("-buildfile");
final String buildFilePath = JpsPathUtil.urlToPath(myExtension.getFileUrl());
programParams.add(buildFilePath);
- programParams.add(myExtension.getTargetName());
+ final String targetName = myExtension.getTargetName();
+ if (targetName != null) {
+ programParams.add(targetName);
+ }
List commandLine = ExternalProcessUtil.buildJavaCommandLine(JpsJavaSdkType.getJavaExecutable(jdk), AntMain2.class.getName(),
Collections.emptyList(), classpath, vmParams, programParams, false);
@@ -182,7 +185,8 @@ public class AntArtifactBuildTaskProvider extends ArtifactBuildTaskProvider {
if (exitCode != 0) {
context.processMessage(new CompilerMessage(BUILDER_NAME, BuildMessage.Kind.ERROR, errorOutput.toString()));
context.processMessage(new CompilerMessage(BUILDER_NAME, BuildMessage.Kind.ERROR,
- "target '" + myExtension.getTargetName() + "' in '" + buildFilePath + "' finished with exit code " + exitCode));
+ "target '" +
+ targetName + "' in '" + buildFilePath + "' finished with exit code " + exitCode));
hasErrors.set(true);
}
}
diff --git a/plugins/devkit/resources/META-INF/plugin.xml b/plugins/devkit/resources/META-INF/plugin.xml
index 3b0d3c24432a..cdaa995df133 100644
--- a/plugins/devkit/resources/META-INF/plugin.xml
+++ b/plugins/devkit/resources/META-INF/plugin.xml
@@ -120,20 +120,18 @@
-
-
-
+
+
-
-
-
+
+
+
+
+
-
-
-
diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/DesignerToolWindowManager.java b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/DesignerToolWindowManager.java
index 44f63b21849b..e4c6e703602e 100644
--- a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/DesignerToolWindowManager.java
+++ b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/DesignerToolWindowManager.java
@@ -29,6 +29,7 @@ import com.intellij.openapi.util.Disposer;
import com.intellij.openapi.wm.ToolWindowAnchor;
import com.intellij.openapi.wm.ToolWindowManager;
import com.intellij.openapi.wm.ex.ToolWindowEx;
+import com.intellij.openapi.wm.impl.content.ToolWindowContentUi;
import com.intellij.ui.IdeBorderFactory;
import com.intellij.ui.ScrollPaneFactory;
import com.intellij.ui.SideBorder;
@@ -149,6 +150,7 @@ public final class DesignerToolWindowManager extends AbstractToolWindowManager {
ToolWindowManager.getInstance(myProject)
.registerToolWindow(DesignerBundle.message("designer.toolwindow.name"), false, ToolWindowAnchor.LEFT, myProject, true);
myToolWindow.setIcon(UIDesignerNewIcons.ToolWindow);
+ myToolWindow.getComponent().putClientProperty(ToolWindowContentUi.HIDE_ID_LABEL, "true");
((ToolWindowEx)myToolWindow).setTitleActions(createActions());
diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/propertyTable/PropertyTablePanel.java b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/propertyTable/PropertyTablePanel.java
index ca506d69bfcc..2b4590f69789 100644
--- a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/propertyTable/PropertyTablePanel.java
+++ b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/propertyTable/PropertyTablePanel.java
@@ -24,6 +24,7 @@ import com.intellij.ui.IdeBorderFactory;
import com.intellij.ui.PopupHandler;
import com.intellij.ui.ScrollPaneFactory;
import com.intellij.ui.SideBorder;
+import com.intellij.util.ui.UIUtil;
import javax.swing.*;
import javax.swing.event.ListSelectionEvent;
@@ -43,8 +44,11 @@ public final class PropertyTablePanel extends JPanel implements ListSelectionLis
setLayout(new GridBagLayout());
setBorder(IdeBorderFactory.createBorder(SideBorder.TOP));
- add(new JLabel(DesignerBundle.message("designer.properties.title")),
- new GridBagConstraints(0, 0, 1, 1, 1, 0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(2, 5, 2, 0), 0, 0));
+ JLabel titleLabel = new JLabel(DesignerBundle.message("designer.properties.title"));
+ titleLabel.setFont(UIUtil.getLabelFont(UIUtil.FontSize.SMALL));
+ add(titleLabel,
+ new GridBagConstraints(0, 0, 1, 1, 1, 0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL,
+ new Insets(2, 5, 2, 0), 0, 0));
ActionManager actionManager = ActionManager.getInstance();
DefaultActionGroup actionGroup = new DefaultActionGroup();
diff --git a/resources/src/idea/RichPlatformActions.xml b/resources/src/idea/RichPlatformActions.xml
index c7337cf2a07a..6ea64062458a 100644
--- a/resources/src/idea/RichPlatformActions.xml
+++ b/resources/src/idea/RichPlatformActions.xml
@@ -123,17 +123,16 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -143,12 +142,13 @@
+
+
+
-