mirror of
https://gitee.com/zhangsken/AndroidIDE.git
synced 2026-10-16 07:49:44 +08:00
Renamed Logger.instance to Logger.newInstance
This commit is contained in:
@@ -93,7 +93,7 @@ public class DesignerActivity extends StudioActivity
|
||||
public static final String KEY_GENERATED_CODE = "designer_xmlCode";
|
||||
public static final String DRAGGING_WIDGET_TAG = "DRAGGING_WIDGET";
|
||||
public static final String DRAGGING_WIDGET_MIME = "application/ide_widget";
|
||||
private static final Logger LOG = Logger.instance("DesignerActivity");
|
||||
private static final Logger LOG = Logger.newInstance ("DesignerActivity");
|
||||
public final String EDITOR_SHEET_DIALOG_TAG = "attribute_editor_dialog";
|
||||
private final boolean isTablet = DeviceUtils.isTablet();
|
||||
private final List<UIWidgetGroup> widgetGroups = new ArrayList<>();
|
||||
|
||||
@@ -148,7 +148,7 @@ public class EditorActivity extends StudioActivity
|
||||
private static final int ACTION_ID_CLOSE = 100;
|
||||
private static final int ACTION_ID_OTHERS = 101;
|
||||
private static final int ACTION_ID_ALL = 102;
|
||||
private static final Logger LOG = Logger.instance("EditorActivity");
|
||||
private static final Logger LOG = Logger.newInstance ("EditorActivity");
|
||||
/**
|
||||
* MenuItem(s) that are related to the build process
|
||||
*
|
||||
|
||||
@@ -62,7 +62,7 @@ import org.json.JSONException;
|
||||
public class TerminalActivity extends StudioActivity {
|
||||
|
||||
public static final String KEY_WORKING_DIRECTORY = "terminal_workingDirectory";
|
||||
private static final Logger LOG = Logger.instance("TerminalActivity");
|
||||
private static final Logger LOG = Logger.newInstance ("TerminalActivity");
|
||||
private static final byte[] SOURCES_LIST_CONTENT =
|
||||
"deb https://androidide.com/packages/ stable main".getBytes();
|
||||
private final Client client = new Client();
|
||||
|
||||
@@ -38,7 +38,7 @@ import java.util.Objects;
|
||||
@SuppressWarnings("deprecation")
|
||||
public class AttrValueFormatTabAdapter extends FragmentStatePagerAdapter {
|
||||
|
||||
private static final Logger LOG = Logger.instance("AttrValueEditorTabAdapter");
|
||||
private static final Logger LOG = Logger.newInstance ("AttrValueEditorTabAdapter");
|
||||
private final List<Fragment> mFragments = new ArrayList<>();
|
||||
private final List<String> mTitles = new ArrayList<>();
|
||||
private final XMLAttribute attribute;
|
||||
|
||||
@@ -49,7 +49,7 @@ import java.util.List;
|
||||
|
||||
public class CompletionListAdapter extends EditorCompletionAdapter {
|
||||
|
||||
private static final Logger LOG = Logger.instance("CompletionListAdapter");
|
||||
private static final Logger LOG = Logger.newInstance ("CompletionListAdapter");
|
||||
|
||||
@Override
|
||||
public void attachValues(
|
||||
|
||||
@@ -17,8 +17,6 @@
|
||||
|
||||
package com.itsaky.androidide.adapters;
|
||||
|
||||
import static com.itsaky.androidide.utils.Logger.instance;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.annotation.Nullable;
|
||||
import androidx.collection.LongSparseArray;
|
||||
@@ -37,7 +35,7 @@ import java.util.List;
|
||||
|
||||
public class EditorBottomSheetTabAdapter extends FragmentStateAdapter {
|
||||
|
||||
private static final Logger LOG = instance("EditorBottomSheetTabAdapter");
|
||||
private static final Logger LOG = Logger.newInstance ("EditorBottomSheetTabAdapter");
|
||||
private final List<Tab> fragments;
|
||||
|
||||
public EditorBottomSheetTabAdapter(@NonNull FragmentActivity fragmentActivity) {
|
||||
|
||||
@@ -37,7 +37,7 @@ public abstract class StudioActivity extends AppCompatActivity {
|
||||
public static final String TAG = "StudioActivity";
|
||||
public static final int REQCODE_STORAGE = 1009;
|
||||
|
||||
protected static Logger LOG = Logger.instance("StudioActivity");
|
||||
protected static Logger LOG = Logger.newInstance ("StudioActivity");
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
|
||||
@@ -43,7 +43,7 @@ import java.util.concurrent.CompletionException;
|
||||
|
||||
public class StudioApp extends BaseApplication {
|
||||
|
||||
private static final Logger LOG = Logger.instance("StudioApp");
|
||||
private static final Logger LOG = Logger.newInstance ("StudioApp");
|
||||
private static StudioApp instance;
|
||||
private static SDKInfo sdkInfo;
|
||||
private final ILanguageServer mJavaLanguageServer = new JavaLanguageServer();
|
||||
|
||||
@@ -17,8 +17,6 @@
|
||||
|
||||
package com.itsaky.androidide.filepicker;
|
||||
|
||||
import static com.itsaky.androidide.utils.Logger.instance;
|
||||
|
||||
import android.content.res.AssetFileDescriptor;
|
||||
import android.database.Cursor;
|
||||
import android.database.MatrixCursor;
|
||||
@@ -56,7 +54,7 @@ import java.util.LinkedList;
|
||||
public class IDEDocumentsProvider extends DocumentsProvider {
|
||||
|
||||
private static final String ALL_MIME_TYPES = "*/*";
|
||||
private static final Logger LOG = instance("IDEDocumentsProvider");
|
||||
private static final Logger LOG = Logger.newInstance ("IDEDocumentsProvider");
|
||||
private static final File BASE_DIR = getBaseDir();
|
||||
// The default columns to return information about a root if no specific
|
||||
// columns are requested in a query.
|
||||
|
||||
@@ -17,8 +17,6 @@
|
||||
|
||||
package com.itsaky.androidide.fragments;
|
||||
|
||||
import static com.itsaky.androidide.utils.Logger.instance;
|
||||
|
||||
import android.os.Bundle;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
@@ -35,7 +33,7 @@ import io.github.rosemoe.sora.lang.EmptyLanguage;
|
||||
|
||||
public abstract class NonEditableEditorFragment extends Fragment {
|
||||
|
||||
private static final Logger LOG = instance("NonEditableEditorFragment");
|
||||
private static final Logger LOG = Logger.newInstance ("NonEditableEditorFragment");
|
||||
private FragmentNonEditableEditorBinding binding;
|
||||
|
||||
@Nullable
|
||||
|
||||
@@ -16,8 +16,6 @@
|
||||
*/
|
||||
package com.itsaky.androidide.fragments.attr;
|
||||
|
||||
import static com.itsaky.androidide.utils.Logger.instance;
|
||||
|
||||
import android.text.Editable;
|
||||
import android.text.TextUtils;
|
||||
import android.widget.AutoCompleteTextView;
|
||||
@@ -37,7 +35,7 @@ import java.util.concurrent.CompletableFuture;
|
||||
*/
|
||||
public abstract class AbstractReferenceEditor extends BaseValueEditorFragment {
|
||||
|
||||
private static final Logger LOG = instance("ReferenceEditor");
|
||||
private static final Logger LOG = Logger.newInstance ("ReferenceEditor");
|
||||
public TextWatcherAdapter resInputWatcher;
|
||||
|
||||
@Override
|
||||
|
||||
@@ -44,7 +44,7 @@ import java.util.stream.Collectors;
|
||||
*/
|
||||
public class DimensionEditor extends AbstractReferenceEditor {
|
||||
|
||||
private static final Logger LOG = Logger.instance("DimensionEditor");
|
||||
private static final Logger LOG = Logger.newInstance ("DimensionEditor");
|
||||
public TextWatcherAdapter dimensionInputWatcher;
|
||||
|
||||
private LayoutDimensionAttrEditorBinding binding;
|
||||
|
||||
@@ -30,7 +30,7 @@ import com.itsaky.androidide.utils.Logger;
|
||||
*/
|
||||
public class EnumEditor extends FixedValueEditor {
|
||||
|
||||
private static final Logger LOG = Logger.instance("EnumEditor");
|
||||
private static final Logger LOG = Logger.newInstance ("EnumEditor");
|
||||
|
||||
@Override
|
||||
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
|
||||
|
||||
@@ -17,8 +17,6 @@
|
||||
|
||||
package com.itsaky.androidide.fragments.attr;
|
||||
|
||||
import static com.itsaky.androidide.utils.Logger.instance;
|
||||
|
||||
import android.os.Bundle;
|
||||
import android.text.TextUtils;
|
||||
import android.view.View;
|
||||
@@ -36,7 +34,7 @@ import java.util.Arrays;
|
||||
*/
|
||||
public class FlagEditor extends FixedValueEditor {
|
||||
|
||||
private static final Logger LOG = instance("FlagEditor");
|
||||
private static final Logger LOG = Logger.newInstance ("FlagEditor");
|
||||
|
||||
@Override
|
||||
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
|
||||
|
||||
@@ -17,8 +17,6 @@
|
||||
*/
|
||||
package com.itsaky.androidide.fragments.preferences;
|
||||
|
||||
import static com.itsaky.androidide.utils.Logger.instance;
|
||||
|
||||
import android.content.Intent;
|
||||
import android.net.Uri;
|
||||
import android.os.Bundle;
|
||||
@@ -43,7 +41,7 @@ public class IDEPreferences extends BasePreferenceFragment
|
||||
public static final String KEY_ISSUES = "idepref_issues";
|
||||
public static final String KEY_CHANGELOG = "idepref_changelog";
|
||||
public static final String KEY_ABOUT = "idepref_about";
|
||||
private static final Logger LOG = instance("IDEPreferences");
|
||||
private static final Logger LOG = Logger.newInstance ("IDEPreferences");
|
||||
private GeneralPreferences mGeneralPrefs;
|
||||
private BuildPreferences mBuildPreferences;
|
||||
private EditorPreferences mEditorPreferences;
|
||||
|
||||
@@ -59,7 +59,7 @@ public class AttrEditorSheet extends BottomSheetDialogFragment
|
||||
BaseValueEditorFragment.OnValueChangeListener {
|
||||
|
||||
private static final List<IconTextListItem> VIEW_ACTIONS = new ArrayList<>();
|
||||
private static final Logger LOG = Logger.instance("AttrBottomSheet");
|
||||
private static final Logger LOG = Logger.newInstance ("AttrBottomSheet");
|
||||
private AttributeListSheet mAttrListSheet;
|
||||
private AttrValueEditorSheet mValueEditorSheet;
|
||||
private IView selectedView;
|
||||
|
||||
@@ -32,7 +32,7 @@ import com.itsaky.androidide.utils.Logger;
|
||||
|
||||
public class ProgressSheet extends BaseBottomSheetFragment {
|
||||
|
||||
private final Logger LOG = Logger.instance("ProgressSheet");
|
||||
private final Logger LOG = Logger.newInstance ("ProgressSheet");
|
||||
private LayoutProgressSheetBinding binding;
|
||||
private String message = "";
|
||||
private String subMessage = "";
|
||||
|
||||
@@ -62,7 +62,7 @@ public class CommonCompletionProvider {
|
||||
String s2 = p2.getSortText() == null ? p2.getLabel() : p2.getSortText();
|
||||
return s1.compareTo(s2);
|
||||
};
|
||||
private static final Logger LOG = Logger.instance("CommonCompletionProvider");
|
||||
private static final Logger LOG = Logger.newInstance ("CommonCompletionProvider");
|
||||
private final ILanguageServer server;
|
||||
private CompletableFuture<CompletionResult> future;
|
||||
|
||||
|
||||
@@ -43,7 +43,7 @@ import org.antlr.v4.runtime.Token;
|
||||
|
||||
public class GroovyAnalyzer extends SimpleAnalyzeManager<Void> {
|
||||
|
||||
private static final Logger LOG = Logger.instance("GroovyAnalyzer");
|
||||
private static final Logger LOG = Logger.newInstance ("GroovyAnalyzer");
|
||||
|
||||
@Override
|
||||
protected Styles analyze(StringBuilder text, Delegate<Void> delegate) {
|
||||
|
||||
@@ -38,7 +38,7 @@ import org.antlr.v4.runtime.Token;
|
||||
|
||||
public class GroovyLanguage extends IDELanguage {
|
||||
|
||||
private static final Logger LOG = Logger.instance("GroovyLanguage");
|
||||
private static final Logger LOG = Logger.newInstance ("GroovyLanguage");
|
||||
private final GroovyAnalyzer analyzer;
|
||||
private final GroovyAutoComplete completer;
|
||||
private final NewlineHandler[] newlineHandlers = new NewlineHandler[] {new BraceHandler()};
|
||||
|
||||
@@ -58,7 +58,7 @@ import org.jetbrains.annotations.Contract;
|
||||
*/
|
||||
public class JavaAnalyzer extends SimpleAnalyzeManager<Void> implements IAnalyzeManager {
|
||||
|
||||
private static final Logger LOG = Logger.instance("JavaAnalyzer");
|
||||
private static final Logger LOG = Logger.newInstance ("JavaAnalyzer");
|
||||
private final List<DiagnosticItem> ideDiagnostics = new ArrayList<>();
|
||||
private List<DiagnosticItem> diagnostics = new ArrayList<>();
|
||||
|
||||
|
||||
@@ -47,7 +47,7 @@ import org.antlr.v4.runtime.Token;
|
||||
|
||||
public class JavaLanguage extends IDELanguage {
|
||||
|
||||
private static final Logger LOG = Logger.instance("JavaLanguage");
|
||||
private static final Logger LOG = Logger.newInstance ("JavaLanguage");
|
||||
private final NewlineHandler[] newlineHandlers;
|
||||
private JavaAnalyzer analyzer;
|
||||
private CommonCompletionProvider completer;
|
||||
|
||||
@@ -44,7 +44,7 @@ import org.antlr.v4.runtime.Token;
|
||||
*/
|
||||
public class XMLAnalyzer extends SimpleAnalyzeManager<Void> {
|
||||
|
||||
private static final Logger LOG = Logger.instance("XMLAnalyzer");
|
||||
private static final Logger LOG = Logger.newInstance ("XMLAnalyzer");
|
||||
|
||||
@Override
|
||||
protected Styles analyze(StringBuilder text, Delegate<Void> delegate) {
|
||||
|
||||
@@ -42,7 +42,7 @@ import org.antlr.v4.runtime.Token;
|
||||
|
||||
public class XMLLanguage extends IDELanguage {
|
||||
|
||||
private static final Logger LOG = Logger.instance("XMLLanguage");
|
||||
private static final Logger LOG = Logger.newInstance ("XMLLanguage");
|
||||
private final CommonCompletionProvider completer;
|
||||
private final NewlineHandler[] newlineHandlers;
|
||||
private XMLAnalyzer analyzer;
|
||||
|
||||
@@ -61,7 +61,7 @@ import java.util.Objects;
|
||||
public class IDELanguageClientImpl implements ILanguageClient {
|
||||
|
||||
protected static final Gson gson = new Gson();
|
||||
protected static final Logger LOG = Logger.instance("AbstractLanguageClient");
|
||||
protected static final Logger LOG = Logger.newInstance ("AbstractLanguageClient");
|
||||
private static IDELanguageClientImpl mInstance;
|
||||
private final Map<File, List<DiagnosticItem>> diagnostics = new HashMap<>();
|
||||
protected EditorActivityProvider activityProvider;
|
||||
|
||||
@@ -30,7 +30,7 @@ import java.util.Locale;
|
||||
|
||||
public class ProjectResourceTable implements IResourceTable {
|
||||
|
||||
private static final Logger LOG = Logger.instance("ProjectResourceFinder");
|
||||
private static final Logger LOG = Logger.newInstance ("ProjectResourceFinder");
|
||||
private File resDir;
|
||||
private File color;
|
||||
private File layout;
|
||||
|
||||
@@ -33,7 +33,7 @@ public class LogReceiver extends BroadcastReceiver {
|
||||
public static final String APPEND_LOG = "com.itsaky.androidide.logs.APPEND_LOG";
|
||||
public static final String EXTRA_LINE = "log_line";
|
||||
|
||||
private final Logger LOG = Logger.instance("LogReceiver");
|
||||
private final Logger LOG = Logger.newInstance ("LogReceiver");
|
||||
|
||||
public LogReceiver setLogListener(LogListener listener) {
|
||||
this.listener = listener;
|
||||
|
||||
@@ -85,7 +85,7 @@ public class IDEService {
|
||||
public static final int TASK_LINT_DEBUG = GradleTask.TASK_LINT_DEBUG;
|
||||
public static final int TASK_LINT_RELEASE = GradleTask.TASK_LINT_RELEASE;
|
||||
|
||||
public static final Logger LOG = Logger.instance("IDEService");
|
||||
public static final Logger LOG = Logger.newInstance ("IDEService");
|
||||
|
||||
private final InputStreamLineReader.OnReadListener mOutputReadListener = this::onBuildOutput;
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@ import java.util.concurrent.CompletionException;
|
||||
|
||||
public class TaskExecutor {
|
||||
|
||||
private final Logger LOG = Logger.instance("TaskExecutor");
|
||||
private final Logger LOG = Logger.newInstance ("TaskExecutor");
|
||||
|
||||
public <R> void executeAsync(Callable<R> callable, Callback<R> callback) {
|
||||
CompletableFuture.supplyAsync(
|
||||
|
||||
@@ -141,5 +141,5 @@ public abstract class ApkGeneratingTask extends BaseGradleTask {
|
||||
return false;
|
||||
}
|
||||
|
||||
private static final Logger LOG = Logger.instance("ApkGeneratingTask");
|
||||
private static final Logger LOG = Logger.newInstance ("ApkGeneratingTask");
|
||||
}
|
||||
|
||||
@@ -54,7 +54,7 @@ public class WidgetDragListener implements View.OnDragListener {
|
||||
|
||||
public static final String ANDROID_NS = "android";
|
||||
|
||||
private static final Logger LOG = Logger.instance("WidgetDragListener");
|
||||
private static final Logger LOG = Logger.newInstance ("WidgetDragListener");
|
||||
|
||||
public WidgetDragListener(
|
||||
@NonNull Context context, IViewGroup viewGroup, OnViewAddedListener addedListener) {
|
||||
|
||||
@@ -30,7 +30,7 @@ import com.itsaky.androidide.databinding.LayoutEditorBottomSheetBinding;
|
||||
public class EditorBottomSheetBehavior<V extends View> extends BottomSheetBehavior<V> {
|
||||
|
||||
private LayoutEditorBottomSheetBinding binding;
|
||||
private static final Logger LOG = Logger.instance("EditorBottomSheetBehavior");
|
||||
private static final Logger LOG = Logger.newInstance ("EditorBottomSheetBehavior");
|
||||
|
||||
public EditorBottomSheetBehavior(Context context, AttributeSet attributeSet) {
|
||||
super(context, attributeSet);
|
||||
|
||||
@@ -134,5 +134,5 @@ public class HighlightRangeHelper {
|
||||
return false;
|
||||
}
|
||||
|
||||
private static final Logger LOG = Logger.instance("HighlightRangeHelper");
|
||||
private static final Logger LOG = Logger.newInstance ("HighlightRangeHelper");
|
||||
}
|
||||
|
||||
@@ -44,7 +44,7 @@ import java.util.regex.Pattern;
|
||||
*/
|
||||
public class RecursiveFileSearcher {
|
||||
|
||||
private static final Logger logger = Logger.instance("RecursiveFileSearcher");
|
||||
private static final Logger logger = Logger.newInstance ("RecursiveFileSearcher");
|
||||
|
||||
/**
|
||||
* Search the given text in files recursively in given search directories
|
||||
|
||||
@@ -78,7 +78,7 @@ import org.antlr.v4.runtime.Token;
|
||||
@SuppressLint("ViewConstructor") // This view is always dynamically created.
|
||||
public class CodeEditorView extends FrameLayout {
|
||||
|
||||
private static final Logger LOG = Logger.instance("CodeEditorView");
|
||||
private static final Logger LOG = Logger.newInstance ("CodeEditorView");
|
||||
private final File file;
|
||||
private final LayoutCodeEditorBinding binding;
|
||||
private boolean isModified;
|
||||
|
||||
@@ -40,7 +40,7 @@ import java.util.stream.Collectors;
|
||||
*/
|
||||
public class EditorTextActionMode implements IDEEditor.ITextActionPresenter {
|
||||
|
||||
private static final Logger LOG = Logger.instance("EditorTextActionMode");
|
||||
private static final Logger LOG = Logger.newInstance ("EditorTextActionMode");
|
||||
private final Set<IDEEditor.TextAction> registeredActions = new TreeSet<>();
|
||||
private IDEEditor editor;
|
||||
private ActionMode actionMode;
|
||||
|
||||
@@ -16,8 +16,6 @@
|
||||
*/
|
||||
package com.itsaky.androidide.views.editor;
|
||||
|
||||
import static com.itsaky.androidide.utils.Logger.instance;
|
||||
|
||||
import android.graphics.RectF;
|
||||
import android.graphics.drawable.Drawable;
|
||||
import android.graphics.drawable.GradientDrawable;
|
||||
@@ -56,7 +54,7 @@ import java.util.stream.Collectors;
|
||||
public class EditorTextActionWindow extends EditorPopupWindow
|
||||
implements IDEEditor.ITextActionPresenter {
|
||||
|
||||
private static final Logger LOG = instance("EditorTextActionWindow");
|
||||
private static final Logger LOG = Logger.newInstance ("EditorTextActionWindow");
|
||||
|
||||
private static final long DELAY = 200;
|
||||
protected final List<SubscriptionReceipt<?>> subscriptionReceipts;
|
||||
|
||||
@@ -73,7 +73,7 @@ import org.jetbrains.annotations.Contract;
|
||||
public class IDEEditor extends CodeEditor {
|
||||
|
||||
public static final String KEY_FILE = "editor_file";
|
||||
private static final Logger LOG = Logger.instance("IDEEditor");
|
||||
private static final Logger LOG = Logger.newInstance ("IDEEditor");
|
||||
private int mFileVersion;
|
||||
private File file;
|
||||
private ILanguageServer mLanguageServer;
|
||||
|
||||
@@ -35,7 +35,7 @@ import io.github.rosemoe.sora.widget.base.EditorPopupWindow;
|
||||
*/
|
||||
public class SignatureHelpWindow extends BaseEditorWindow {
|
||||
|
||||
private static final Logger LOG = Logger.instance("SignatureHelpWindow");
|
||||
private static final Logger LOG = Logger.newInstance ("SignatureHelpWindow");
|
||||
|
||||
/**
|
||||
* Create a signature help popup window for editor
|
||||
|
||||
@@ -55,7 +55,7 @@ public class ColorPickerView extends LinearLayout {
|
||||
private final LayoutColorPickerBinding binding;
|
||||
private final int DEFAULT_COLOR;
|
||||
|
||||
private static final Logger LOG = Logger.instance("ColorPickerView");
|
||||
private static final Logger LOG = Logger.newInstance ("ColorPickerView");
|
||||
|
||||
private final Slider.OnChangeListener mValueChangeListener =
|
||||
(slider, value, fromUser) -> {
|
||||
|
||||
@@ -33,7 +33,7 @@ public class ToolsManager {
|
||||
|
||||
public static final int LOG_SENDER_VERSION = 2;
|
||||
public static final String KEY_LOG_SENDER_VERSION = "tools_logsenderVersion";
|
||||
private static final Logger LOG = Logger.instance("ToolsManager");
|
||||
private static final Logger LOG = Logger.newInstance ("ToolsManager");
|
||||
public static String ARCH_SPECIFIC_ASSET_DATA_DIR = "data/" + BaseApplication.getArch();
|
||||
public static String COMMON_ASSET_DATA_DIR = "data/common";
|
||||
private static PreferenceManager prefs;
|
||||
|
||||
@@ -38,7 +38,7 @@ public class ShellServer extends Thread {
|
||||
private BufferedReader output;
|
||||
private Process process;
|
||||
|
||||
private static final Logger LOG = Logger.instance("ShellServer");
|
||||
private static final Logger LOG = Logger.newInstance ("ShellServer");
|
||||
|
||||
public ShellServer(
|
||||
Callback callback,
|
||||
|
||||
@@ -50,7 +50,7 @@ import java.util.zip.ZipInputStream;
|
||||
*/
|
||||
public class BootstrapInstaller {
|
||||
|
||||
private static final Logger LOG = Logger.instance("BootstrapInstaller");
|
||||
private static final Logger LOG = Logger.newInstance ("BootstrapInstaller");
|
||||
|
||||
@NonNull
|
||||
public static CompletableFuture<Void> doInstall(
|
||||
|
||||
@@ -40,7 +40,7 @@ public final class Environment {
|
||||
public static final String DEFAULT_HOME = DEFAULT_ROOT + "/framework";
|
||||
private static final String DEFAULT_JAVA_HOME = DEFAULT_HOME + "/jdk";
|
||||
private static final String DEFAULT_ANDROID_HOME = DEFAULT_HOME + "/android-sdk";
|
||||
private static final Logger LOG = Logger.instance("Environment");
|
||||
private static final Logger LOG = Logger.newInstance ("Environment");
|
||||
private static final List<String> blacklist = new ArrayList<>();
|
||||
public static File ROOT;
|
||||
public static File SYSROOT;
|
||||
|
||||
@@ -18,12 +18,16 @@
|
||||
package com.itsaky.androidide.utils;
|
||||
|
||||
import android.util.Log;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
|
||||
import com.blankj.utilcode.util.ThrowableUtils;
|
||||
|
||||
import org.jetbrains.annotations.Contract;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
import org.jetbrains.annotations.Contract;
|
||||
|
||||
/**
|
||||
* Logger for the IDE.
|
||||
@@ -69,7 +73,7 @@ public class Logger {
|
||||
|
||||
@NonNull
|
||||
@Contract("_ -> new")
|
||||
public static Logger instance(String tag) {
|
||||
public static Logger newInstance(String tag) {
|
||||
return createInstance(tag);
|
||||
}
|
||||
|
||||
|
||||
@@ -72,7 +72,7 @@ data class CompletionItem(@JvmField var label: String,
|
||||
)
|
||||
|
||||
companion object {
|
||||
private val LOG = Logger.instance("CompletionItem")
|
||||
private val LOG = Logger.newInstance("CompletionItem")
|
||||
}
|
||||
|
||||
fun setLabel(label: String) {
|
||||
|
||||
@@ -347,5 +347,5 @@ public class FileStore {
|
||||
}
|
||||
}
|
||||
|
||||
private static final Logger LOG = Logger.instance("FileStore");
|
||||
private static final Logger LOG = Logger.newInstance ("FileStore");
|
||||
}
|
||||
|
||||
@@ -64,7 +64,7 @@ import java.util.concurrent.CompletableFuture;
|
||||
|
||||
public class JavaLanguageServer implements ILanguageServer, IDocumentHandler {
|
||||
|
||||
private static final Logger LOG = Logger.instance("JavaLanguageServer");
|
||||
private static final Logger LOG = Logger.newInstance ("JavaLanguageServer");
|
||||
private final AnalyzeTimer analyzeTimer;
|
||||
private ILanguageClient client;
|
||||
private IServerSettings settings;
|
||||
|
||||
@@ -41,7 +41,7 @@ import javax.tools.JavaFileObject;
|
||||
|
||||
public class CompileBatch implements AutoCloseable {
|
||||
|
||||
private static final Logger LOG = Logger.instance("CompileBatch");
|
||||
private static final Logger LOG = Logger.newInstance ("CompileBatch");
|
||||
private static final Path FILE_NOT_FOUND = Paths.get("");
|
||||
final JavaCompilerService parent;
|
||||
final ReusableCompiler.Borrow borrow;
|
||||
|
||||
@@ -368,5 +368,5 @@ public class JavaCompilerService implements CompilerProvider {
|
||||
}
|
||||
}
|
||||
|
||||
private static final Logger LOG = Logger.instance("JavaCompilerService");
|
||||
private static final Logger LOG = Logger.newInstance ("JavaCompilerService");
|
||||
}
|
||||
|
||||
@@ -76,7 +76,7 @@ import javax.tools.JavaFileObject;
|
||||
*/
|
||||
public class ReusableCompiler {
|
||||
|
||||
private static final Logger LOG = Logger.instance("ReusableCompiler");
|
||||
private static final Logger LOG = Logger.newInstance ("ReusableCompiler");
|
||||
private static final JavacTool systemProvider = JavacTool.create();
|
||||
|
||||
private final List<String> currentOptions = new ArrayList<>();
|
||||
|
||||
@@ -34,8 +34,6 @@
|
||||
|
||||
package com.itsaky.lsp.java.compiler;
|
||||
|
||||
import static com.itsaky.androidide.utils.Logger.instance;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
import com.itsaky.androidide.utils.Logger;
|
||||
import java.util.concurrent.Semaphore;
|
||||
@@ -44,7 +42,7 @@ import kotlin.jvm.functions.Function1;
|
||||
|
||||
public class SynchronizedTask {
|
||||
|
||||
private static final Logger LOG = instance("SynchronizedTask");
|
||||
private static final Logger LOG = Logger.newInstance ("SynchronizedTask");
|
||||
private final Semaphore semaphore = new Semaphore(1);
|
||||
private volatile boolean isWriting;
|
||||
private CompileTask task;
|
||||
|
||||
@@ -484,5 +484,5 @@ public class Parser {
|
||||
return "";
|
||||
}
|
||||
|
||||
private static final Logger LOG = Logger.instance("JavaParser");
|
||||
private static final Logger LOG = Logger.newInstance ("JavaParser");
|
||||
}
|
||||
|
||||
@@ -88,7 +88,7 @@ public class CodeActionProvider {
|
||||
Pattern.compile("^'((\\w+\\.)*\\w+)' is not thrown");
|
||||
private static final Pattern UNREPORTED_EXCEPTION =
|
||||
Pattern.compile("unreported exception ((\\w+\\.)*\\w+)");
|
||||
private static final Logger LOG = Logger.instance("JavaCodeActionProvider");
|
||||
private static final Logger LOG = Logger.newInstance ("JavaCodeActionProvider");
|
||||
private final CompilerProvider compiler;
|
||||
|
||||
public CodeActionProvider(CompilerProvider compiler) {
|
||||
|
||||
@@ -17,8 +17,6 @@
|
||||
|
||||
package com.itsaky.lsp.java.providers;
|
||||
|
||||
import static com.itsaky.androidide.utils.Logger.instance;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
import com.google.common.io.CharSink;
|
||||
import com.google.common.io.CharSource;
|
||||
@@ -37,7 +35,7 @@ import java.io.Writer;
|
||||
*/
|
||||
public class CodeFormatProvider {
|
||||
|
||||
private static final Logger LOG = instance("JavaCodeFormatProvider");
|
||||
private static final Logger LOG = Logger.newInstance ("JavaCodeFormatProvider");
|
||||
|
||||
private final JavaServerSettings settings;
|
||||
|
||||
|
||||
@@ -154,7 +154,7 @@ public class CompletionProvider extends AbstractServiceProvider implements IComp
|
||||
"float",
|
||||
"double",
|
||||
};
|
||||
private static final Logger LOG = Logger.instance("JavaCompletionProvider");
|
||||
private static final Logger LOG = Logger.newInstance ("JavaCompletionProvider");
|
||||
private final CompilerProvider compiler;
|
||||
private Path completingFile;
|
||||
private long cursor;
|
||||
|
||||
@@ -45,7 +45,7 @@ import javax.tools.JavaFileObject;
|
||||
|
||||
public class DefinitionProvider {
|
||||
public static final List<Location> NOT_SUPPORTED = Collections.emptyList();
|
||||
private static final Logger LOG = Logger.instance("JavaDefinitionProvider");
|
||||
private static final Logger LOG = Logger.newInstance ("JavaDefinitionProvider");
|
||||
private final CompilerProvider compiler;
|
||||
private Path file;
|
||||
private int line, column;
|
||||
|
||||
@@ -32,7 +32,7 @@ import com.sun.source.tree.CompilationUnitTree;
|
||||
*/
|
||||
public class JavaSelectionProvider {
|
||||
|
||||
private static final Logger LOG = Logger.instance("JavaSelectionProvider");
|
||||
private static final Logger LOG = Logger.newInstance ("JavaSelectionProvider");
|
||||
private final CompilerProvider compiler;
|
||||
|
||||
public JavaSelectionProvider(CompilerProvider compiler) {
|
||||
|
||||
@@ -49,7 +49,7 @@ import javax.lang.model.type.DeclaredType;
|
||||
import javax.lang.model.type.TypeMirror;
|
||||
|
||||
public class CreateMissingMethod extends Rewrite {
|
||||
private static final Logger LOG = Logger.instance("main");
|
||||
private static final Logger LOG = Logger.newInstance ("main");
|
||||
final Path file;
|
||||
final int position;
|
||||
int argCount = -1;
|
||||
|
||||
@@ -45,7 +45,7 @@ import javax.lang.model.element.TypeElement;
|
||||
|
||||
public class GenerateRecordConstructor extends Rewrite {
|
||||
|
||||
private static final Logger LOG = Logger.instance("main");
|
||||
private static final Logger LOG = Logger.newInstance ("main");
|
||||
final String className;
|
||||
|
||||
public GenerateRecordConstructor(String className) {
|
||||
|
||||
@@ -48,7 +48,7 @@ import javax.lang.model.util.Elements;
|
||||
|
||||
public class ImplementAbstractMethods extends Rewrite {
|
||||
|
||||
private static final Logger LOG = Logger.instance("main");
|
||||
private static final Logger LOG = Logger.newInstance ("main");
|
||||
private final String className;
|
||||
private final String classFile;
|
||||
private final long position;
|
||||
|
||||
@@ -67,5 +67,5 @@ public class ScanClassPath {
|
||||
}
|
||||
}
|
||||
|
||||
private static final Logger LOG = Logger.instance("ScanClassPath");
|
||||
private static final Logger LOG = Logger.newInstance ("ScanClassPath");
|
||||
}
|
||||
|
||||
@@ -520,5 +520,5 @@ public class StringSearch {
|
||||
|
||||
private static final ThreadLocal<char[]> SKIP_CHAR_BUFFER =
|
||||
ThreadLocal.withInitial(StringSearch::charArray);
|
||||
private static final Logger LOG = Logger.instance("StringSearch");
|
||||
private static final Logger LOG = Logger.newInstance ("StringSearch");
|
||||
}
|
||||
|
||||
@@ -309,5 +309,5 @@ public class DiagnosticVisitor extends TreeScanner<Void, Map<TreePath, String>>
|
||||
}
|
||||
}
|
||||
|
||||
private static final Logger LOG = Logger.instance("main");
|
||||
private static final Logger LOG = Logger.newInstance ("main");
|
||||
}
|
||||
|
||||
@@ -56,7 +56,7 @@ public class FindBiggerRange extends TreeScanner<Range, Range> {
|
||||
|
||||
final Range treeRange = getRange(tree);
|
||||
if (treeRange != null && range.isSmallerThan(treeRange)) {
|
||||
Logger.instance("FindBiggerRange")
|
||||
Logger.newInstance ("FindBiggerRange")
|
||||
.debug("Selecting tree", tree, tree.getClass(), tree.getKind());
|
||||
return treeRange;
|
||||
}
|
||||
|
||||
@@ -139,5 +139,5 @@ public class FindCompletionsAt extends TreePathScanner<TreePath, Long> {
|
||||
return b;
|
||||
}
|
||||
|
||||
private static final Logger LOG = Logger.instance("FindCompletionsAt");
|
||||
private static final Logger LOG = Logger.newInstance ("FindCompletionsAt");
|
||||
}
|
||||
|
||||
@@ -259,5 +259,5 @@ public class FindMethodCallAt extends TreePathScanner<MethodInvocationTree, Inte
|
||||
return null;
|
||||
}
|
||||
|
||||
private static final Logger LOG = Logger.instance("main");
|
||||
private static final Logger LOG = Logger.newInstance ("main");
|
||||
}
|
||||
|
||||
@@ -228,5 +228,5 @@ public class SemanticHighlighter extends TreePathScanner<Void, List<HighlightTok
|
||||
return super.visitMethod(tree, colors);
|
||||
}
|
||||
|
||||
private static final Logger LOG = Logger.instance("JavaSemanticHighlighter");
|
||||
private static final Logger LOG = Logger.newInstance ("JavaSemanticHighlighter");
|
||||
}
|
||||
|
||||
@@ -44,5 +44,5 @@ abstract class LoggingTest : BaseLanguageServerTest() {
|
||||
|
||||
@Suppress("PropertyName")
|
||||
@JvmField
|
||||
protected val LOG = Logger.instance(javaClass.simpleName)
|
||||
protected val LOG = Logger.newInstance(javaClass.simpleName)
|
||||
}
|
||||
@@ -55,7 +55,7 @@ import org.jetbrains.annotations.Contract;
|
||||
*/
|
||||
public class CompletionProvider extends AbstractServiceProvider implements ICompletionProvider {
|
||||
|
||||
private static final Logger LOG = Logger.instance("XMLCompletionProvider");
|
||||
private static final Logger LOG = Logger.newInstance ("XMLCompletionProvider");
|
||||
private static final String APP_NS = "http://schemas.android.com/apk/res/auto";
|
||||
private static final String ANDROID_NS = "http://schemas.android.com/apk/res/android";
|
||||
private static final String TOOLS_NS = "http://schemas.android.com/tools";
|
||||
|
||||
@@ -30,7 +30,7 @@ import org.xmlpull.v1.XmlPullParserFactory;
|
||||
public class XmlUtils {
|
||||
|
||||
private static final XmlPullParserFactory parserFactory;
|
||||
private static final Logger LOG = Logger.instance("XmlUtils");
|
||||
private static final Logger LOG = Logger.newInstance ("XmlUtils");
|
||||
|
||||
static {
|
||||
try {
|
||||
|
||||
@@ -72,7 +72,7 @@ public class Attr implements Parcelable {
|
||||
return new Attr[size];
|
||||
}
|
||||
};
|
||||
private static final Logger LOG = Logger.instance("AttrInfo::Attr");
|
||||
private static final Logger LOG = Logger.newInstance ("AttrInfo::Attr");
|
||||
public INamespace namespace;
|
||||
public String name;
|
||||
public Set<String> possibleValues;
|
||||
|
||||
@@ -68,7 +68,7 @@ class XMLLayoutInflater extends BaseLayoutInflater {
|
||||
|
||||
private ContextProvider contextProvider;
|
||||
|
||||
private static final Logger LOG = Logger.instance("XMLLayoutInflater");
|
||||
private static final Logger LOG = Logger.newInstance ("XMLLayoutInflater");
|
||||
public static final String ATTR_ADAPTER_SUFFIX = "AttrAdapter";
|
||||
|
||||
XMLLayoutInflater(@NonNull LayoutInflaterConfiguration config) {
|
||||
|
||||
+1
-1
@@ -45,7 +45,7 @@ import com.itsaky.xml.INamespace;
|
||||
*/
|
||||
public class ViewAttrAdapter extends CommonParseUtils implements IAttributeAdapter {
|
||||
|
||||
protected static final Logger LOG = Logger.instance("BaseViewAttrAdapter");
|
||||
protected static final Logger LOG = Logger.newInstance ("BaseViewAttrAdapter");
|
||||
|
||||
public ViewAttrAdapter(@NonNull IResourceTable resourceFinder, DisplayMetrics displayMetrics) {
|
||||
super(resourceFinder, displayMetrics);
|
||||
|
||||
@@ -45,7 +45,7 @@ import org.xmlpull.v1.XmlPullParserFactory;
|
||||
*/
|
||||
public abstract class DrawableParserFactory {
|
||||
|
||||
private static final Logger LOG = Logger.instance("IDrawableParser");
|
||||
private static final Logger LOG = Logger.newInstance ("IDrawableParser");
|
||||
|
||||
/**
|
||||
* Create a new drawable parser for the given file. If the given file is not an XML Document,
|
||||
|
||||
@@ -34,7 +34,7 @@ import org.xmlpull.v1.XmlPullParser;
|
||||
*/
|
||||
public class StateListParser extends IDrawableParser {
|
||||
|
||||
private static final Logger LOG = Logger.instance("StateListParser");
|
||||
private static final Logger LOG = Logger.newInstance ("StateListParser");
|
||||
|
||||
protected StateListParser(
|
||||
XmlPullParser parser,
|
||||
|
||||
@@ -50,7 +50,7 @@ public abstract class BaseView implements IView {
|
||||
protected Object stored;
|
||||
private boolean isPlaceholder;
|
||||
|
||||
protected final Logger LOG = Logger.instance(getClass().getSimpleName());
|
||||
protected final Logger LOG = Logger.newInstance (getClass().getSimpleName());
|
||||
|
||||
public BaseView(String qualifiedName, View view) {
|
||||
this(qualifiedName, view, false);
|
||||
|
||||
@@ -51,7 +51,7 @@ public class CommonParseUtils {
|
||||
protected IResourceTable resourceFinder;
|
||||
protected final DisplayMetrics displayMetrics;
|
||||
|
||||
private static final Logger LOG = Logger.instance("CommonParseUtils");
|
||||
private static final Logger LOG = Logger.newInstance ("CommonParseUtils");
|
||||
|
||||
public CommonParseUtils(@NonNull IResourceTable resourceFinder, DisplayMetrics displayMetrics) {
|
||||
this.resourceFinder = resourceFinder;
|
||||
|
||||
@@ -46,7 +46,7 @@ import org.xmlpull.v1.XmlPullParserFactory;
|
||||
*/
|
||||
public class ValuesTable {
|
||||
|
||||
private static final Logger LOG = Logger.instance("ValuesTable");
|
||||
private static final Logger LOG = Logger.newInstance ("ValuesTable");
|
||||
// TODO Parse styles and styleables
|
||||
private final Map<String, IResource> arrays;
|
||||
private final Map<String, IResource> strings;
|
||||
|
||||
@@ -32,7 +32,7 @@ import java.util.regex.Pattern;
|
||||
public class ValuesTableFactory {
|
||||
|
||||
private static final Map<File, ValuesTable> valueTables = new HashMap<>();
|
||||
private static final Logger LOG = Logger.instance("ValuesTableFactory");
|
||||
private static final Logger LOG = Logger.newInstance ("ValuesTableFactory");
|
||||
|
||||
public static ValuesTable getTable(final File resDir) {
|
||||
return valueTables.getOrDefault(resDir, null);
|
||||
|
||||
+1
-1
@@ -24,7 +24,7 @@ import java.util.ArrayList;
|
||||
/** This class is a duplicate of the PathParser.java in androidx.core.graphics package. */
|
||||
public class PathParser {
|
||||
|
||||
private static final Logger LOG = Logger.instance("PathParser");
|
||||
private static final Logger LOG = Logger.newInstance ("PathParser");
|
||||
|
||||
// Copy from Arrays.copyOfRange() which is only available from API level 9.
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user