From e4d168eadcc9df974e4c037412649b5fa51dd546 Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Mon, 13 Jan 2014 09:24:28 +0100 Subject: [PATCH 1/3] CR-IC-3246#c17895 hide LocalFileUrl --- .../src/com/intellij/util/LocalFileUrl.java | 3 +++ .../platform-impl/src/com/intellij/util/Urls.java | 14 ++++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/util/LocalFileUrl.java b/platform/platform-impl/src/com/intellij/util/LocalFileUrl.java index 0ac07b5259ea..93fa00370413 100644 --- a/platform/platform-impl/src/com/intellij/util/LocalFileUrl.java +++ b/platform/platform-impl/src/com/intellij/util/LocalFileUrl.java @@ -6,6 +6,9 @@ import org.jetbrains.annotations.Nullable; public final class LocalFileUrl implements Url { private final String path; + /** + * Use {@link Urls#newLocalFileUrl(String)} instead + */ public LocalFileUrl(@NotNull String path) { this.path = path; } diff --git a/platform/platform-impl/src/com/intellij/util/Urls.java b/platform/platform-impl/src/com/intellij/util/Urls.java index 2a7b9c5b76d8..87e3b901224a 100644 --- a/platform/platform-impl/src/com/intellij/util/Urls.java +++ b/platform/platform-impl/src/com/intellij/util/Urls.java @@ -43,6 +43,16 @@ public final class Urls { return new UrlImpl(scheme, null, path); } + @NotNull + public static Url newLocalFileUrl(@NotNull String path) { + return new LocalFileUrl(path); + } + + @NotNull + public static Url newLocalFileUrl(@NotNull VirtualFile file) { + return newLocalFileUrl(file.getPath()); + } + @NotNull public static Url newFromEncoded(@NotNull String url) { Url result = parseEncoded(url); @@ -78,7 +88,7 @@ public final class Urls { // java.net.URI.create cannot parse "file:///Test Stuff" - but you don't need to worry about it - this method is aware @Nullable public static Url parseFromIdea(@NotNull String url) { - return URLUtil.containsScheme(url) ? parseUrl(url) : new LocalFileUrl(url); + return URLUtil.containsScheme(url) ? parseUrl(url) : newLocalFileUrl(url); } @Nullable @@ -89,7 +99,7 @@ public final class Urls { if (asLocalIfNoScheme && !URLUtil.containsScheme(url)) { // nodejs debug — files only in local filesystem - return new LocalFileUrl(url); + return newLocalFileUrl(url); } return parseUrl(VfsUtilCore.toIdeaUrl(url)); } From 39237d034165db569bdc49c4073a68accf3d5cf8 Mon Sep 17 00:00:00 2001 From: Alexander Zolotov Date: Mon, 13 Jan 2014 12:25:04 +0400 Subject: [PATCH 2/3] WEB-10469 CSS Error Highlighting - Marking valid custom HTML tag as error --- xml/xml-psi-impl/src/com/intellij/xml/util/HtmlUtil.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xml/xml-psi-impl/src/com/intellij/xml/util/HtmlUtil.java b/xml/xml-psi-impl/src/com/intellij/xml/util/HtmlUtil.java index 950cac531a74..15ff3f19a379 100644 --- a/xml/xml-psi-impl/src/com/intellij/xml/util/HtmlUtil.java +++ b/xml/xml-psi-impl/src/com/intellij/xml/util/HtmlUtil.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2014 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. @@ -264,7 +264,7 @@ public class HtmlUtil { return descriptors; } - public static XmlElementDescriptor[] getCustomTagDescriptors(XmlElement context) { + public static XmlElementDescriptor[] getCustomTagDescriptors(@Nullable PsiElement context) { String entitiesString = getEntitiesString(context, XmlEntitiesInspection.TAG_SHORT_NAME); if (entitiesString == null) return XmlElementDescriptor.EMPTY_ARRAY; @@ -298,7 +298,7 @@ public class HtmlUtil { } @Nullable - public static String getEntitiesString(XmlElement context, String inspectionName) { + public static String getEntitiesString(@Nullable PsiElement context, @NotNull String inspectionName) { if (context == null) return null; PsiFile containingFile = context.getContainingFile().getOriginalFile(); From ea3b1ed88d1c3b6f9ab2c4aa0a95f961d243e342 Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Mon, 13 Jan 2014 09:34:15 +0100 Subject: [PATCH 3/3] CR-IC-3884#c20360 "Setup" method should return VOID. --- platform/util/src/com/intellij/ui/TableUtil.java | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/platform/util/src/com/intellij/ui/TableUtil.java b/platform/util/src/com/intellij/ui/TableUtil.java index d91f2bd2956b..82b69f81224c 100644 --- a/platform/util/src/com/intellij/ui/TableUtil.java +++ b/platform/util/src/com/intellij/ui/TableUtil.java @@ -199,23 +199,16 @@ public class TableUtil { table.setRowSelectionInterval(0, 0); } - /** - * @return column width - */ - public static int setupCheckboxColumn(@NotNull JTable table, int columnIndex) { - return setupCheckboxColumn(table.getColumnModel().getColumn(columnIndex)); + public static void setupCheckboxColumn(@NotNull JTable table, int columnIndex) { + setupCheckboxColumn(table.getColumnModel().getColumn(columnIndex)); } - /** - * @return column width - */ - public static int setupCheckboxColumn(@NotNull TableColumn column) { + public static void setupCheckboxColumn(@NotNull TableColumn column) { int checkboxWidth = new JCheckBox().getPreferredSize().width; column.setResizable(false); column.setPreferredWidth(checkboxWidth); column.setMaxWidth(checkboxWidth); column.setMinWidth(checkboxWidth); - return checkboxWidth; } public static void updateScroller(@NotNull JTable table, boolean temporaryHideVerticalScrollBar) {