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

made final

Browse Source
This commit is contained in:
Alexey Kudravtsev
2014-02-12 15:02:17 +04:00
parent 2067791f30
commit cb1eb74f69
15 changed files with 45 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/execution/impl/RunDialog.java
+2 -2
View File
@@ -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.
@@ -38,7 +38,7 @@ public class RunDialog extends DialogWrapper implements RunConfigurable.RunDialo
private final Project myProject;
private final RunConfigurable myConfigurable;
private JComponent myCenterPanel;
@NonNls public static String HELP_ID = "reference.dialogs.rundebug";
@NonNls public static final String HELP_ID = "reference.dialogs.rundebug";
private final Executor myExecutor;
public RunDialog(final Project project, final Executor executor) {
platform/platform-api/src/com/intellij/openapi/actionSystem/ActionPlaces.java
+2 -2
View File
@@ -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.
@@ -109,7 +109,7 @@ public abstract class ActionPlaces {
public static final String PHING_EXPLORER_POPUP = "PhingExplorerPopup";
public static final String PHING_EXPLORER_TOOLBAR = "PhingExplorerToolbar";
public static final String DOCK_MENU = "DockMenu";
public static String PHING_MESSAGES_TOOLBAR = "PhingMessagesToolbar";
public static final String PHING_MESSAGES_TOOLBAR = "PhingMessagesToolbar";
public static final String CHANGES_LOCAL_DIFF_SETTINGS = "CHANGES_LOCAL_DIFF_SETTINGS";
platform/platform-impl/src/com/intellij/internal/statistic/ideSettings/IdeSettingsStatisticsService.java
+2 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2012 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.
@@ -30,7 +30,7 @@ import java.net.URL;
public class IdeSettingsStatisticsService extends SettingsConnectionService {
private static final Logger LOG = Logger.getInstance("#com.intellij.internal.statistic.ideSettings.IdeSettingsUsagesCollector");
private static String FILE_NAME = "ide-settings-statistics.xml";
private static final String FILE_NAME = "ide-settings-statistics.xml";
private static final IdeSettingsStatisticsService myInstance = new IdeSettingsStatisticsService();
private IdeSettingsDescriptor[] myDescriptors;
platform/platform-impl/src/com/intellij/openapi/ui/playback/commands/AbstractCommand.java
+2 -3
View File
@@ -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.
@@ -18,14 +18,13 @@ package com.intellij.openapi.ui.playback.commands;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.ui.playback.PlaybackCommand;
import com.intellij.openapi.ui.playback.PlaybackContext;
import com.intellij.openapi.ui.playback.PlaybackRunner;
import com.intellij.openapi.util.ActionCallback;
import java.io.File;
public abstract class AbstractCommand implements PlaybackCommand {
public static String CMD_PREFIX = "%";
public static final String CMD_PREFIX = "%";
private final String myText;
private final int myLine;
platform/platform-impl/src/com/intellij/openapi/ui/playback/commands/AssertFocused.java
+2 -3
View File
@@ -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.
@@ -17,7 +17,6 @@ package com.intellij.openapi.ui.playback.commands;
import com.intellij.openapi.ui.Queryable;
import com.intellij.openapi.ui.playback.PlaybackContext;
import com.intellij.openapi.ui.playback.PlaybackRunner;
import com.intellij.openapi.util.ActionCallback;
import com.intellij.openapi.wm.IdeFocusManager;
@@ -26,7 +25,7 @@ import java.util.*;
public class AssertFocused extends AbstractCommand {
public static String PREFIX = CMD_PREFIX + "assert focused";
public static final String PREFIX = CMD_PREFIX + "assert focused";
public AssertFocused(String text, int line) {
super(text, line);
platform/platform-impl/src/com/intellij/openapi/ui/playback/commands/DelayCommand.java
+2 -2
View File
@@ -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.
@@ -19,7 +19,7 @@ import com.intellij.openapi.ui.playback.PlaybackContext;
import com.intellij.openapi.util.ActionCallback;
public class DelayCommand extends AbstractCommand {
public static String PREFIX = CMD_PREFIX + "delay";
public static final String PREFIX = CMD_PREFIX + "delay";
public DelayCommand(String text, int line) {
super(text, line);
platform/platform-impl/src/com/intellij/openapi/ui/playback/commands/KeyShortcutCommand.java
+3 -3
View File
@@ -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.
@@ -20,8 +20,8 @@ import com.intellij.openapi.util.ActionCallback;
public class KeyShortcutCommand extends TypeCommand {
public static String PREFIX = CMD_PREFIX + "[";
public static String POSTFIX = "]";
public static final String PREFIX = CMD_PREFIX + "[";
public static final String POSTFIX = "]";
public KeyShortcutCommand(String text, int line) {
super(text, line);
platform/platform-impl/src/com/intellij/openapi/ui/playback/commands/RegistryValueCommand.java
+2 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2011 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.
@@ -21,7 +21,7 @@ import com.intellij.openapi.util.registry.Registry;
public class RegistryValueCommand extends AbstractCommand {
public static String PREFIX = CMD_PREFIX + "set";
public static final String PREFIX = CMD_PREFIX + "set";
public RegistryValueCommand(String text, int line) {
super(text, line);
platform/platform-impl/src/com/intellij/openapi/ui/playback/commands/StopCommand.java
+2 -2
View File
@@ -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.
@@ -20,7 +20,7 @@ import com.intellij.openapi.util.ActionCallback;
public class StopCommand extends AbstractCommand {
public static String PREFIX = CMD_PREFIX + "stop";
public static final String PREFIX = CMD_PREFIX + "stop";
public StopCommand(String text, int line) {
super(text, line);
platform/util/src/com/intellij/execution/configurations/CommandLineTokenizer.java
+2 -2
View File
@@ -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.
@@ -26,7 +26,7 @@ import java.util.StringTokenizer;
*/
public class CommandLineTokenizer extends StringTokenizer {
private static String DEFAULT_DELIMITERS = " \t\n\r\f";
private static final String DEFAULT_DELIMITERS = " \t\n\r\f";
// keep source level 1.4
private List myTokens = new ArrayList();
private int myCurrentToken = 0;
platform/vcs-api/src/com/intellij/vcsUtil/VcsUtil.java
+2 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2012 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.
@@ -589,7 +589,7 @@ public class VcsUtil {
return (! s1Trimmed.equals(s2Trimmed)) && s1Trimmed.equalsIgnoreCase(s2Trimmed);
}
private static String ANNO_ASPECT = "show.vcs.annotation.aspect.";
private static final String ANNO_ASPECT = "show.vcs.annotation.aspect.";
//public static boolean isAspectAvailableByDefault(LineAnnotationAspect aspect) {
// if (aspect.getId() == null) return aspect.isShowByDefault();
// return PropertiesComponent.getInstance().getBoolean(ANNO_ASPECT + aspect.getId(), aspect.isShowByDefault());
plugins/devkit/src/dom/impl/LanguageResolvingUtil.java
+1 -1
View File
@@ -45,7 +45,7 @@ import java.util.List;
class LanguageResolvingUtil {
private static String ANY_LANGUAGE_DEFAULT_ID = Language.ANY.getID();
private static final String ANY_LANGUAGE_DEFAULT_ID = Language.ANY.getID();
static Collection<LanguageDefinition> getAllLanguageDefinitions(ConvertContext context) {
List<LanguageDefinition> languageDefinitions = collectLanguageDefinitions(context);
plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/refactorings/introduce/IntroducePropertyAction.java
+17 -2
View File
@@ -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 org.jetbrains.idea.maven.dom.refactorings.introduce;
import com.intellij.find.FindManager;
@@ -43,8 +58,8 @@ import org.jetbrains.idea.maven.dom.model.MavenDomProperties;
import java.util.*;
public class IntroducePropertyAction extends BaseRefactoringAction {
private static String PREFIX = "${";
private static String SUFFIX = "}";
private static final String PREFIX = "${";
private static final String SUFFIX = "}";
public IntroducePropertyAction() {
setInjectedContext(true);
plugins/testng/src/com/theoryinpractice/testng/inspection/DependsOnGroupsInspection.java
+2 -2
View File
@@ -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.
@@ -48,7 +48,7 @@ public class DependsOnGroupsInspection extends BaseJavaLocalInspectionTool {
private static final Pattern PATTERN = Pattern.compile("\"([a-zA-Z0-9_\\-\\(\\)]*)\"");
public JDOMExternalizableStringList groups = new JDOMExternalizableStringList();
@NonNls public static String SHORT_NAME = "groupsTestNG";
@NonNls public static final String SHORT_NAME = "groupsTestNG";
@NotNull
@Override
python/testSrc/com/jetbrains/python/PyStructureViewTest.java
+2 -2
View File
@@ -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.
@@ -25,7 +25,7 @@ import static com.intellij.testFramework.PlatformTestUtil.assertTreeEqual;
* @author vlan
*/
public class PyStructureViewTest extends PyTestCase {
private static String TEST_DIRECTORY = "structureView/";
private static final String TEST_DIRECTORY = "structureView/";
public void testBaseClassNames() {
myFixture.configureByFiles(TEST_DIRECTORY + "baseClassNames.py",