diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/SideEffectWarningDialog.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/SideEffectWarningDialog.java index 8a992662935d..e5c8694cb860 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/SideEffectWarningDialog.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/SideEffectWarningDialog.java @@ -131,8 +131,8 @@ public class SideEffectWarningDialog extends DialogWrapper { "There are possible side effects found in expressions assigned to the variable ''{0}''
\n" + "You can:\n" + "
\n" + - "— Remove variable usages along with all expressions involved, or
\n" + - "— Transform expressions assigned to variable into the statements on their own.
\n" + + "- Remove variable usages along with all expressions involved, or
\n" + + "- Transform expressions assigned to variable into the statements on their own.
\n" + "
\n" + " That is,
\n" + " \n" + diff --git a/platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleImpl.java b/platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleImpl.java index 711184d9b705..87e2f12a18d8 100644 --- a/platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleImpl.java +++ b/platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleImpl.java @@ -750,7 +750,7 @@ public class LanguageConsoleImpl implements Disposable, TypeSafeDataProvider { history.getSettings().setAdditionalColumnsCount(2 + (width - historySize.width) / EditorUtil.getSpaceWidth(Font.PLAIN, history)); } - // deal with height, WEB-11122 we cannot trust editor width — it could be 0 in case of soft wrap even if editor has text + // deal with height, WEB-11122 we cannot trust editor width - it could be 0 in case of soft wrap even if editor has text if (history.getDocument().getLineCount() == 0) { historySize.height = 0; } diff --git a/platform/platform-api/src/com/intellij/util/Url.java b/platform/platform-api/src/com/intellij/util/Url.java index f78b237d7070..80d3fe9cd668 100644 --- a/platform/platform-api/src/com/intellij/util/Url.java +++ b/platform/platform-api/src/com/intellij/util/Url.java @@ -1,9 +1,24 @@ +/* + * 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package com.intellij.util; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -// We don't use Java URI due to problem — http://cns-etuat-2.localnet.englishtown.com/school/e12/#school/45383/201/221/382?c=countrycode=cc|culturecode=en-us|partnercode=mkge +// We don't use Java URI due to problem - http://cns-etuat-2.localnet.englishtown.com/school/e12/#school/45383/201/221/382?c=countrycode=cc|culturecode=en-us|partnercode=mkge // it is illegal URI (fragment before query), but we must support such URI // Semicolon as parameters separator is supported (WEB-6671) public interface Url { diff --git a/platform/platform-impl/src/com/intellij/util/Urls.java b/platform/platform-impl/src/com/intellij/util/Urls.java index a09b1dbcf96a..abe4c5ae75b2 100644 --- a/platform/platform-impl/src/com/intellij/util/Urls.java +++ b/platform/platform-impl/src/com/intellij/util/Urls.java @@ -99,7 +99,7 @@ public final class Urls { } if (asLocalIfNoScheme && !URLUtil.containsScheme(url)) { - // nodejs debug — files only in local filesystem + // nodejs debug - files only in local filesystem return newLocalFileUrl(url); } return parseUrl(VfsUtilCore.toIdeaUrl(url)); diff --git a/platform/testRunner/src/com/intellij/execution/testframework/autotest/AutoTestManager.java b/platform/testRunner/src/com/intellij/execution/testframework/autotest/AutoTestManager.java index 3f15ee3f6de3..14e0cf32ef62 100644 --- a/platform/testRunner/src/com/intellij/execution/testframework/autotest/AutoTestManager.java +++ b/platform/testRunner/src/com/intellij/execution/testframework/autotest/AutoTestManager.java @@ -1,3 +1,18 @@ +/* + * 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package com.intellij.execution.testframework.autotest; import com.intellij.execution.DelayedDocumentWatcher; @@ -58,7 +73,7 @@ public class AutoTestManager { }, new Condition() { @Override public boolean value(VirtualFile file) { - // Vladimir.Krivosheev — I don't know, why AutoTestManager checks it, but old behavior is preserved + // Vladimir.Krivosheev - I don't know, why AutoTestManager checks it, but old behavior is preserved return FileEditorManager.getInstance(myProject).isFileOpen(file); } }); diff --git a/platform/util/src/com/intellij/ui/mac/foundation/Foundation.java b/platform/util/src/com/intellij/ui/mac/foundation/Foundation.java index e8277dbe0798..f4ad998b1cd4 100644 --- a/platform/util/src/com/intellij/ui/mac/foundation/Foundation.java +++ b/platform/util/src/com/intellij/ui/mac/foundation/Foundation.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. @@ -95,7 +95,7 @@ public class Foundation { * * @param cls The class to which to add a method. * @param selectorName A selector that specifies the name of the method being added. - * @param impl A function which is the implementation of the new method. The function must take at least two arguments—self and _cmd. + * @param impl A function which is the implementation of the new method. The function must take at least two arguments-self and _cmd. * @param types An array of characters that describe the types of the arguments to the method. * See * @return true if the method was added successfully, otherwise false (for example, the class already contains a method implementation with that name). diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/VcsApplicationSettings.java b/platform/vcs-api/src/com/intellij/openapi/vcs/VcsApplicationSettings.java index 67e04f2f5241..619c6c460603 100644 --- a/platform/vcs-api/src/com/intellij/openapi/vcs/VcsApplicationSettings.java +++ b/platform/vcs-api/src/com/intellij/openapi/vcs/VcsApplicationSettings.java @@ -19,7 +19,7 @@ import com.intellij.openapi.components.*; import com.intellij.util.xmlb.XmlSerializerUtil; /** - * We don't use roaming type PER_PLATFORM — path macros is enough ($USER_HOME$/Dropbox for example) + * We don't use roaming type PER_PLATFORM - path macros is enough ($USER_HOME$/Dropbox for example) */ @State( name = "VcsApplicationSettings", diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/XLineBreakpointImpl.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/XLineBreakpointImpl.java index 855abaaad74e..0d2fcb000d22 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/XLineBreakpointImpl.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/XLineBreakpointImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 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. @@ -123,7 +123,7 @@ public class XLineBreakpointImpl

extends XBreak if (markupModel == null) { markupModel = (MarkupModelEx)DocumentMarkupModel.forDocument(document, getProject(), false); if (markupModel != null) { - // renderersChanged false — we don't change gutter size + // renderersChanged false - we don't change gutter size markupModel.fireAttributesChanged(highlighter, false); } }