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

notnull

Browse Source
This commit is contained in:
Alexey Kudravtsev
2012-11-12 12:44:28 +04:00
parent 7400c3ae86
commit 5cc8ad16dd
3 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/find/FindSettings.java
+7 -2
View File
@@ -17,8 +17,9 @@
package com.intellij.find;
import com.intellij.openapi.components.ServiceManager;
import org.jetbrains.annotations.NotNull;
import java.util.ArrayList;
import java.util.List;
public abstract class FindSettings{
@@ -84,8 +85,10 @@ public abstract class FindSettings{
public abstract void addDirectory(String s);
@NotNull
public abstract String[] getRecentFindStrings();
@NotNull
public abstract String[] getRecentReplaceStrings();
/**
@@ -95,9 +98,11 @@ public abstract class FindSettings{
* @return the recent file masks list
* @since 5.0.2
*/
@NotNull
public abstract String[] getRecentFileMasks();
public abstract ArrayList<String> getRecentDirectories();
@NotNull
public abstract List<String> getRecentDirectories();
public abstract void setWithSubdirectories(boolean b);
platform/lang-impl/src/com/intellij/find/impl/FindSettingsImpl.java
+6 -1
View File
@@ -32,6 +32,7 @@ import com.intellij.util.ArrayUtil;
import com.intellij.util.PlatformUtils;
import org.jdom.Element;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import java.util.ArrayList;
import java.util.List;
@@ -317,23 +318,27 @@ public class FindSettingsImpl extends FindSettings implements PersistentStateCom
addStringToList(s, RECENT_DIR_STRINGS, MAX_RECENT_SIZE);
}
@NotNull
@Override
public String[] getRecentFindStrings(){
return ArrayUtil.toStringArray(RECENT_FIND_STRINGS);
}
@NotNull
@Override
public String[] getRecentReplaceStrings(){
return ArrayUtil.toStringArray(RECENT_REPLACE_STRINGS);
}
@NotNull
@Override
public String[] getRecentFileMasks() {
return ArrayUtil.toStringArray(RECENT_FILE_MASKS);
}
@NotNull
@Override
public ArrayList<String> getRecentDirectories(){
public List<String> getRecentDirectories(){
return new ArrayList<String>(RECENT_DIR_STRINGS);
}
platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java
+3 -1
View File
@@ -495,7 +495,8 @@ public abstract class DialogWrapper {
return panel;
}
private Action[] filter(Action[] actions) {
@NotNull
private Action[] filter(@NotNull Action[] actions) {
ArrayList<Action> answer = new ArrayList<Action>();
for (Action action : actions) {
if (action != null && (ApplicationInfo.contextHelpAvailable() || action != getHelpAction())) {
@@ -877,6 +878,7 @@ public abstract class DialogWrapper {
* @see #createSouthPanel
* @see #createJButtonForAction
*/
@NotNull
protected Action[] createActions() {
if (getHelpId() == null) {
if (SystemInfo.isMac) {