diff --git a/actions/src/main/java/com/itsaky/androidide/actions/internal/DefaultActionsRegistry.kt b/actions/src/main/java/com/itsaky/androidide/actions/internal/DefaultActionsRegistry.kt index 6be06863a..67cbf9a43 100644 --- a/actions/src/main/java/com/itsaky/androidide/actions/internal/DefaultActionsRegistry.kt +++ b/actions/src/main/java/com/itsaky/androidide/actions/internal/DefaultActionsRegistry.kt @@ -23,7 +23,7 @@ import com.itsaky.androidide.actions.ActionData import com.itsaky.androidide.actions.ActionItem import com.itsaky.androidide.actions.ActionMenu import com.itsaky.androidide.actions.ActionsRegistry -import com.itsaky.androidide.utils.Logger +import com.itsaky.androidide.utils.ILogger import java.util.concurrent.CompletableFuture /** @@ -33,7 +33,7 @@ import java.util.concurrent.CompletableFuture */ class DefaultActionsRegistry : ActionsRegistry() { - private val log = Logger.newInstance("DefaultActionsRegistry") + private val log = ILogger.newInstance("DefaultActionsRegistry") private val actions: MutableMap> = mutableMapOf() private val listeners = mutableSetOf() diff --git a/app/src/main/java/com/itsaky/androidide/DesignerActivity.java b/app/src/main/java/com/itsaky/androidide/DesignerActivity.java index 13533f4f6..b81dd2e22 100755 --- a/app/src/main/java/com/itsaky/androidide/DesignerActivity.java +++ b/app/src/main/java/com/itsaky/androidide/DesignerActivity.java @@ -68,7 +68,7 @@ import com.itsaky.androidide.ui.WidgetDragListener; import com.itsaky.androidide.ui.WidgetDragShadowBuilder; import com.itsaky.androidide.ui.WidgetTouchListener; import com.itsaky.androidide.utils.DialogUtils; -import com.itsaky.androidide.utils.Logger; +import com.itsaky.androidide.utils.ILogger; import com.itsaky.inflater.IAttribute; import com.itsaky.inflater.IInflateListener; import com.itsaky.inflater.ILayoutInflater; @@ -97,7 +97,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.newInstance("DesignerActivity"); + private static final ILogger LOG = ILogger.newInstance("DesignerActivity"); public final String EDITOR_SHEET_DIALOG_TAG = "attribute_editor_dialog"; private final boolean isTablet = DeviceUtils.isTablet(); private final List widgetGroups = new ArrayList<>(); diff --git a/app/src/main/java/com/itsaky/androidide/EditorActivity.java b/app/src/main/java/com/itsaky/androidide/EditorActivity.java index 7ddc3eb99..8a95d0a5b 100755 --- a/app/src/main/java/com/itsaky/androidide/EditorActivity.java +++ b/app/src/main/java/com/itsaky/androidide/EditorActivity.java @@ -106,7 +106,7 @@ import com.itsaky.androidide.utils.EditorActivityActions; import com.itsaky.androidide.utils.EditorBottomSheetBehavior; import com.itsaky.androidide.utils.Environment; import com.itsaky.androidide.utils.LSPUtils; -import com.itsaky.androidide.utils.Logger; +import com.itsaky.androidide.utils.ILogger; import com.itsaky.androidide.utils.RecursiveFileSearcher; import com.itsaky.androidide.utils.Symbols; import com.itsaky.androidide.viewmodel.EditorViewModel; @@ -159,7 +159,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.newInstance("EditorActivity"); + private static final ILogger LOG = ILogger.newInstance("EditorActivity"); private ActivityEditorBinding mBinding; private LayoutDiagnosticInfoBinding mDiagnosticInfoBinding; diff --git a/app/src/main/java/com/itsaky/androidide/TerminalActivity.java b/app/src/main/java/com/itsaky/androidide/TerminalActivity.java index 5e22e49a4..c6018e795 100755 --- a/app/src/main/java/com/itsaky/androidide/TerminalActivity.java +++ b/app/src/main/java/com/itsaky/androidide/TerminalActivity.java @@ -43,7 +43,7 @@ import com.itsaky.androidide.fragments.sheets.ProgressSheet; import com.itsaky.androidide.managers.PreferenceManager; import com.itsaky.androidide.models.ConstantsBridge; import com.itsaky.androidide.utils.BootstrapInstaller; -import com.itsaky.androidide.utils.Logger; +import com.itsaky.androidide.utils.ILogger; import com.itsaky.androidide.utils.TypefaceUtils; import com.itsaky.androidide.views.virtualkeys.SpecialButton; import com.itsaky.androidide.views.virtualkeys.VirtualKeyButton; @@ -66,7 +66,7 @@ import java.util.Map; public class TerminalActivity extends StudioActivity { public static final String KEY_WORKING_DIRECTORY = "terminal_workingDirectory"; - private static final Logger LOG = Logger.newInstance("TerminalActivity"); + private static final ILogger LOG = ILogger.newInstance("TerminalActivity"); private static final byte[] SOURCES_LIST_CONTENT = "deb https://androidide.com/packages/ stable main".getBytes(); private final Client client = new Client(); diff --git a/app/src/main/java/com/itsaky/androidide/actions/editor/find/ReplaceAction.kt b/app/src/main/java/com/itsaky/androidide/actions/editor/find/ReplaceAction.kt index b28f0a38d..e2437f5ca 100644 --- a/app/src/main/java/com/itsaky/androidide/actions/editor/find/ReplaceAction.kt +++ b/app/src/main/java/com/itsaky/androidide/actions/editor/find/ReplaceAction.kt @@ -25,7 +25,7 @@ import com.itsaky.androidide.R import com.itsaky.androidide.actions.ActionData import com.itsaky.androidide.databinding.LayoutEditorFindReplaceBinding import com.itsaky.androidide.utils.DialogUtils -import com.itsaky.androidide.utils.Logger +import com.itsaky.androidide.utils.ILogger /** * Shows dialog to replace one or all the matched text in editor searcher. @@ -34,7 +34,7 @@ import com.itsaky.androidide.utils.Logger class ReplaceAction() : SearchActionModeAction() { override val id: String = "editor.search.replace" - private val log = Logger.newInstance(javaClass.simpleName) + private val log = ILogger.newInstance(javaClass.simpleName) constructor(context: Context) : this() { label = context.getString(R.string.replace) diff --git a/app/src/main/java/com/itsaky/androidide/actions/file/SaveFileAction.kt b/app/src/main/java/com/itsaky/androidide/actions/file/SaveFileAction.kt index e44f02c7c..4d11ceebf 100644 --- a/app/src/main/java/com/itsaky/androidide/actions/file/SaveFileAction.kt +++ b/app/src/main/java/com/itsaky/androidide/actions/file/SaveFileAction.kt @@ -23,13 +23,13 @@ import com.itsaky.androidide.R import com.itsaky.androidide.actions.ActionData import com.itsaky.androidide.actions.EditorRelatedAction import com.itsaky.androidide.app.StudioApp -import com.itsaky.androidide.utils.Logger +import com.itsaky.androidide.utils.ILogger import com.itsaky.toaster.Toaster /** @author Akash Yadav */ class SaveFileAction() : EditorRelatedAction() { - private val log = Logger.newInstance("SaveFileAction") + private val log = ILogger.newInstance("SaveFileAction") override val id: String = "editor_saveFile" diff --git a/app/src/main/java/com/itsaky/androidide/adapters/AttrValueFormatTabAdapter.java b/app/src/main/java/com/itsaky/androidide/adapters/AttrValueFormatTabAdapter.java index 32c914c0e..6a074db50 100644 --- a/app/src/main/java/com/itsaky/androidide/adapters/AttrValueFormatTabAdapter.java +++ b/app/src/main/java/com/itsaky/androidide/adapters/AttrValueFormatTabAdapter.java @@ -27,7 +27,7 @@ import androidx.fragment.app.FragmentStatePagerAdapter; import com.itsaky.androidide.fragments.attr.BaseValueEditorFragment; import com.itsaky.androidide.models.XMLAttribute; -import com.itsaky.androidide.utils.Logger; +import com.itsaky.androidide.utils.ILogger; import java.util.ArrayList; import java.util.List; @@ -41,7 +41,7 @@ import java.util.Objects; @SuppressWarnings("deprecation") public class AttrValueFormatTabAdapter extends FragmentStatePagerAdapter { - private static final Logger LOG = Logger.newInstance("AttrValueEditorTabAdapter"); + private static final ILogger LOG = ILogger.newInstance("AttrValueEditorTabAdapter"); private final List mFragments = new ArrayList<>(); private final List mTitles = new ArrayList<>(); private final XMLAttribute attribute; diff --git a/app/src/main/java/com/itsaky/androidide/adapters/CompletionListAdapter.java b/app/src/main/java/com/itsaky/androidide/adapters/CompletionListAdapter.java index de4b9018a..a99e7ee90 100755 --- a/app/src/main/java/com/itsaky/androidide/adapters/CompletionListAdapter.java +++ b/app/src/main/java/com/itsaky/androidide/adapters/CompletionListAdapter.java @@ -36,7 +36,7 @@ import com.google.gson.JsonObject; import com.itsaky.androidide.R; import com.itsaky.androidide.app.StudioApp; import com.itsaky.androidide.databinding.LayoutCompletionItemBinding; -import com.itsaky.androidide.utils.Logger; +import com.itsaky.androidide.utils.ILogger; import com.itsaky.androidide.utils.TypefaceUtils; import com.itsaky.apiinfo.ApiInfo; import com.itsaky.apiinfo.models.ClassInfo; @@ -53,7 +53,7 @@ import io.github.rosemoe.sora.widget.component.EditorCompletionAdapter; public class CompletionListAdapter extends EditorCompletionAdapter { - private static final Logger LOG = Logger.newInstance("CompletionListAdapter"); + private static final ILogger LOG = ILogger.newInstance("CompletionListAdapter"); @Override public void attachValues( diff --git a/app/src/main/java/com/itsaky/androidide/adapters/EditorBottomSheetTabAdapter.java b/app/src/main/java/com/itsaky/androidide/adapters/EditorBottomSheetTabAdapter.java index f6dfa4769..be1fa25d8 100644 --- a/app/src/main/java/com/itsaky/androidide/adapters/EditorBottomSheetTabAdapter.java +++ b/app/src/main/java/com/itsaky/androidide/adapters/EditorBottomSheetTabAdapter.java @@ -30,14 +30,14 @@ import com.itsaky.androidide.fragments.IDELogFragment; import com.itsaky.androidide.fragments.LogViewFragment; import com.itsaky.androidide.fragments.SearchResultFragment; import com.itsaky.androidide.fragments.SimpleOutputFragment; -import com.itsaky.androidide.utils.Logger; +import com.itsaky.androidide.utils.ILogger; import java.util.ArrayList; import java.util.List; public class EditorBottomSheetTabAdapter extends FragmentStateAdapter { - private static final Logger LOG = Logger.newInstance("EditorBottomSheetTabAdapter"); + private static final ILogger LOG = ILogger.newInstance("EditorBottomSheetTabAdapter"); private final List fragments; public EditorBottomSheetTabAdapter(@NonNull FragmentActivity fragmentActivity) { diff --git a/app/src/main/java/com/itsaky/androidide/app/StudioActivity.java b/app/src/main/java/com/itsaky/androidide/app/StudioActivity.java index 3575ffa8b..bbf93c564 100755 --- a/app/src/main/java/com/itsaky/androidide/app/StudioActivity.java +++ b/app/src/main/java/com/itsaky/androidide/app/StudioActivity.java @@ -31,7 +31,7 @@ import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentTransaction; import com.itsaky.androidide.R; -import com.itsaky.androidide.utils.Logger; +import com.itsaky.androidide.utils.ILogger; public abstract class StudioActivity extends AppCompatActivity { private boolean toRequestStorage = true; @@ -39,7 +39,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.newInstance("StudioActivity"); + protected static ILogger LOG = ILogger.newInstance("StudioActivity"); @Override protected void onCreate(Bundle savedInstanceState) { diff --git a/app/src/main/java/com/itsaky/androidide/app/StudioApp.java b/app/src/main/java/com/itsaky/androidide/app/StudioApp.java index f5c670f7d..c69d141c9 100755 --- a/app/src/main/java/com/itsaky/androidide/app/StudioApp.java +++ b/app/src/main/java/com/itsaky/androidide/app/StudioApp.java @@ -25,7 +25,7 @@ import com.blankj.utilcode.util.ThrowableUtils; import com.itsaky.androidide.CrashHandlerActivity; import com.itsaky.androidide.R; import com.itsaky.androidide.project.ProjectResourceTable; -import com.itsaky.androidide.utils.Logger; +import com.itsaky.androidide.utils.ILogger; import com.itsaky.apiinfo.ApiInfo; import com.itsaky.attrinfo.AttrInfo; import com.itsaky.inflater.ILayoutInflater; @@ -44,7 +44,7 @@ import java.util.concurrent.CompletionException; public class StudioApp extends BaseApplication { - private static final Logger LOG = Logger.newInstance("StudioApp"); + private static final ILogger LOG = ILogger.newInstance("StudioApp"); private static StudioApp instance; private static SDKInfo sdkInfo; private final ILanguageServer mJavaLanguageServer = new JavaLanguageServer(); diff --git a/app/src/main/java/com/itsaky/androidide/filepicker/IDEDocumentsProvider.java b/app/src/main/java/com/itsaky/androidide/filepicker/IDEDocumentsProvider.java index 38c56676a..5dba7781b 100644 --- a/app/src/main/java/com/itsaky/androidide/filepicker/IDEDocumentsProvider.java +++ b/app/src/main/java/com/itsaky/androidide/filepicker/IDEDocumentsProvider.java @@ -32,7 +32,7 @@ import androidx.annotation.NonNull; import com.itsaky.androidide.R; import com.itsaky.androidide.utils.Environment; -import com.itsaky.androidide.utils.Logger; +import com.itsaky.androidide.utils.ILogger; import java.io.File; import java.io.FileNotFoundException; @@ -57,7 +57,7 @@ import java.util.LinkedList; public class IDEDocumentsProvider extends DocumentsProvider { private static final String ALL_MIME_TYPES = "*/*"; - private static final Logger LOG = Logger.newInstance("IDEDocumentsProvider"); + private static final ILogger LOG = ILogger.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. diff --git a/app/src/main/java/com/itsaky/androidide/fragments/FileTreeFragment.java b/app/src/main/java/com/itsaky/androidide/fragments/FileTreeFragment.java index 865ffb5c9..e7022e722 100755 --- a/app/src/main/java/com/itsaky/androidide/fragments/FileTreeFragment.java +++ b/app/src/main/java/com/itsaky/androidide/fragments/FileTreeFragment.java @@ -44,7 +44,7 @@ import com.itsaky.androidide.project.AndroidProject; import com.itsaky.androidide.tasks.TaskExecutor; import com.itsaky.androidide.tasks.callables.FileTreeCallable; import com.itsaky.androidide.utils.Environment; -import com.itsaky.androidide.utils.Logger; +import com.itsaky.androidide.utils.ILogger; import com.itsaky.androidide.views.editor.CodeEditorView; import com.itsaky.toaster.Toaster; import com.unnamed.b.atv.model.TreeNode; @@ -59,7 +59,7 @@ public class FileTreeFragment extends BottomSheetDialogFragment implements TreeNode.TreeNodeClickListener, TreeNode.TreeNodeLongClickListener { private static final String KEY_STORED_TREE_STATE = "fileTree_state"; - private static final Logger LOG = Logger.newInstance("FileTreeFragment"); + private static final ILogger LOG = ILogger.newInstance("FileTreeFragment"); private LayoutEditorFileTreeBinding binding; private AndroidTreeView mFileTreeView; private FileActionListener mFileActionListener; diff --git a/app/src/main/java/com/itsaky/androidide/fragments/IDELogFragment.java b/app/src/main/java/com/itsaky/androidide/fragments/IDELogFragment.java index 3acd85706..8d4aba8fa 100644 --- a/app/src/main/java/com/itsaky/androidide/fragments/IDELogFragment.java +++ b/app/src/main/java/com/itsaky/androidide/fragments/IDELogFragment.java @@ -20,14 +20,14 @@ package com.itsaky.androidide.fragments; import androidx.annotation.NonNull; import com.itsaky.androidide.models.LogLine; -import com.itsaky.androidide.utils.Logger; +import com.itsaky.androidide.utils.ILogger; public class IDELogFragment extends LogViewFragment { - private final Logger.LogListener listener = this::log; + private final ILogger.LogListener listener = this::log; public IDELogFragment() { - Logger.addLogListener(listener); + ILogger.addLogListener(listener); } @Override @@ -47,7 +47,7 @@ public class IDELogFragment extends LogViewFragment { } private void logLine(int priority, String tag, String message) { - final var line = new LogLine(Logger.priorityChar(priority), tag, message); + final var line = new LogLine(ILogger.priorityChar(priority), tag, message); appendLog(line); } } diff --git a/app/src/main/java/com/itsaky/androidide/fragments/NonEditableEditorFragment.java b/app/src/main/java/com/itsaky/androidide/fragments/NonEditableEditorFragment.java index eeb50f0d4..e040870d2 100644 --- a/app/src/main/java/com/itsaky/androidide/fragments/NonEditableEditorFragment.java +++ b/app/src/main/java/com/itsaky/androidide/fragments/NonEditableEditorFragment.java @@ -28,7 +28,7 @@ import androidx.fragment.app.Fragment; import com.itsaky.androidide.databinding.FragmentNonEditableEditorBinding; import com.itsaky.androidide.syntax.colorschemes.SchemeAndroidIDE; -import com.itsaky.androidide.utils.Logger; +import com.itsaky.androidide.utils.ILogger; import com.itsaky.androidide.utils.TypefaceUtils; import com.itsaky.androidide.views.editor.IDEEditor; @@ -36,7 +36,7 @@ import io.github.rosemoe.sora.lang.EmptyLanguage; public abstract class NonEditableEditorFragment extends Fragment { - private static final Logger LOG = Logger.newInstance("NonEditableEditorFragment"); + private static final ILogger LOG = ILogger.newInstance("NonEditableEditorFragment"); private FragmentNonEditableEditorBinding binding; @Nullable diff --git a/app/src/main/java/com/itsaky/androidide/fragments/attr/AbstractReferenceEditor.java b/app/src/main/java/com/itsaky/androidide/fragments/attr/AbstractReferenceEditor.java index b19be999f..9f843dc5b 100644 --- a/app/src/main/java/com/itsaky/androidide/fragments/attr/AbstractReferenceEditor.java +++ b/app/src/main/java/com/itsaky/androidide/fragments/attr/AbstractReferenceEditor.java @@ -25,7 +25,7 @@ import androidx.annotation.NonNull; import com.blankj.utilcode.util.ThreadUtils; import com.google.android.material.textfield.MaterialAutoCompleteTextView; import com.itsaky.androidide.adapters.AttrValueCompletionAdapter; -import com.itsaky.androidide.utils.Logger; +import com.itsaky.androidide.utils.ILogger; import com.itsaky.androidide.utils.TextWatcherAdapter; import java.util.ArrayList; @@ -38,7 +38,7 @@ import java.util.concurrent.CompletableFuture; */ public abstract class AbstractReferenceEditor extends BaseValueEditorFragment { - private static final Logger LOG = Logger.newInstance("ReferenceEditor"); + private static final ILogger LOG = ILogger.newInstance("ReferenceEditor"); public TextWatcherAdapter resInputWatcher; @Override diff --git a/app/src/main/java/com/itsaky/androidide/fragments/attr/DimensionEditor.java b/app/src/main/java/com/itsaky/androidide/fragments/attr/DimensionEditor.java index b86c008ed..e06adac84 100644 --- a/app/src/main/java/com/itsaky/androidide/fragments/attr/DimensionEditor.java +++ b/app/src/main/java/com/itsaky/androidide/fragments/attr/DimensionEditor.java @@ -31,7 +31,7 @@ import androidx.annotation.Nullable; import com.google.android.material.textfield.MaterialAutoCompleteTextView; import com.itsaky.androidide.R; import com.itsaky.androidide.databinding.LayoutDimensionAttrEditorBinding; -import com.itsaky.androidide.utils.Logger; +import com.itsaky.androidide.utils.ILogger; import com.itsaky.androidide.utils.TextWatcherAdapter; import com.itsaky.inflater.values.FrameworkValues; import com.itsaky.inflater.values.ValuesTableFactory; @@ -47,7 +47,7 @@ import java.util.stream.Collectors; */ public class DimensionEditor extends AbstractReferenceEditor { - private static final Logger LOG = Logger.newInstance("DimensionEditor"); + private static final ILogger LOG = ILogger.newInstance("DimensionEditor"); public TextWatcherAdapter dimensionInputWatcher; private LayoutDimensionAttrEditorBinding binding; diff --git a/app/src/main/java/com/itsaky/androidide/fragments/attr/EnumEditor.java b/app/src/main/java/com/itsaky/androidide/fragments/attr/EnumEditor.java index cc9be31cf..7d62920f9 100644 --- a/app/src/main/java/com/itsaky/androidide/fragments/attr/EnumEditor.java +++ b/app/src/main/java/com/itsaky/androidide/fragments/attr/EnumEditor.java @@ -25,14 +25,14 @@ import androidx.annotation.Nullable; import com.google.android.material.chip.Chip; import com.google.android.material.chip.ChipGroup; -import com.itsaky.androidide.utils.Logger; +import com.itsaky.androidide.utils.ILogger; /** * @author Akash Yadav */ public class EnumEditor extends FixedValueEditor { - private static final Logger LOG = Logger.newInstance("EnumEditor"); + private static final ILogger LOG = ILogger.newInstance("EnumEditor"); @Override public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { diff --git a/app/src/main/java/com/itsaky/androidide/fragments/attr/FlagEditor.java b/app/src/main/java/com/itsaky/androidide/fragments/attr/FlagEditor.java index d41e58af9..ec7e5b978 100644 --- a/app/src/main/java/com/itsaky/androidide/fragments/attr/FlagEditor.java +++ b/app/src/main/java/com/itsaky/androidide/fragments/attr/FlagEditor.java @@ -27,7 +27,7 @@ import androidx.annotation.Nullable; import com.google.android.material.chip.Chip; import com.google.android.material.chip.ChipGroup; -import com.itsaky.androidide.utils.Logger; +import com.itsaky.androidide.utils.ILogger; import java.util.ArrayList; import java.util.Arrays; @@ -37,7 +37,7 @@ import java.util.Arrays; */ public class FlagEditor extends FixedValueEditor { - private static final Logger LOG = Logger.newInstance("FlagEditor"); + private static final ILogger LOG = ILogger.newInstance("FlagEditor"); @Override public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { diff --git a/app/src/main/java/com/itsaky/androidide/fragments/preferences/IDEPreferences.java b/app/src/main/java/com/itsaky/androidide/fragments/preferences/IDEPreferences.java index 30690adf2..f56c20cae 100755 --- a/app/src/main/java/com/itsaky/androidide/fragments/preferences/IDEPreferences.java +++ b/app/src/main/java/com/itsaky/androidide/fragments/preferences/IDEPreferences.java @@ -30,7 +30,7 @@ import com.itsaky.androidide.BuildConfig; import com.itsaky.androidide.R; import com.itsaky.androidide.app.BaseApplication; import com.itsaky.androidide.app.StudioApp; -import com.itsaky.androidide.utils.Logger; +import com.itsaky.androidide.utils.ILogger; import com.itsaky.toaster.Toaster; public class IDEPreferences extends BasePreferenceFragment @@ -43,7 +43,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 = Logger.newInstance("IDEPreferences"); + private static final ILogger LOG = ILogger.newInstance("IDEPreferences"); private GeneralPreferences mGeneralPrefs; private BuildPreferences mBuildPreferences; private EditorPreferences mEditorPreferences; diff --git a/app/src/main/java/com/itsaky/androidide/fragments/sheets/AttrEditorSheet.java b/app/src/main/java/com/itsaky/androidide/fragments/sheets/AttrEditorSheet.java index d06e58bb5..5ede2c18b 100644 --- a/app/src/main/java/com/itsaky/androidide/fragments/sheets/AttrEditorSheet.java +++ b/app/src/main/java/com/itsaky/androidide/fragments/sheets/AttrEditorSheet.java @@ -38,7 +38,7 @@ import com.itsaky.androidide.fragments.attr.BaseValueEditorFragment; import com.itsaky.androidide.models.IconTextListItem; import com.itsaky.androidide.models.XMLAttribute; import com.itsaky.androidide.utils.DialogUtils; -import com.itsaky.androidide.utils.Logger; +import com.itsaky.androidide.utils.ILogger; import com.itsaky.attrinfo.models.Attr; import com.itsaky.inflater.IAttribute; import com.itsaky.inflater.IView; @@ -63,7 +63,7 @@ public class AttrEditorSheet extends BottomSheetDialogFragment BaseValueEditorFragment.OnValueChangeListener { private static final List VIEW_ACTIONS = new ArrayList<>(); - private static final Logger LOG = Logger.newInstance("AttrBottomSheet"); + private static final ILogger LOG = ILogger.newInstance("AttrBottomSheet"); private AttributeListSheet mAttrListSheet; private AttrValueEditorSheet mValueEditorSheet; private IView selectedView; diff --git a/app/src/main/java/com/itsaky/androidide/fragments/sheets/ProgressSheet.java b/app/src/main/java/com/itsaky/androidide/fragments/sheets/ProgressSheet.java index 0007a9587..6a61b4fdd 100755 --- a/app/src/main/java/com/itsaky/androidide/fragments/sheets/ProgressSheet.java +++ b/app/src/main/java/com/itsaky/androidide/fragments/sheets/ProgressSheet.java @@ -30,11 +30,11 @@ import android.widget.RelativeLayout; import androidx.annotation.NonNull; import com.itsaky.androidide.databinding.LayoutProgressSheetBinding; -import com.itsaky.androidide.utils.Logger; +import com.itsaky.androidide.utils.ILogger; public class ProgressSheet extends BaseBottomSheetFragment { - private final Logger LOG = Logger.newInstance("ProgressSheet"); + private final ILogger LOG = ILogger.newInstance("ProgressSheet"); private LayoutProgressSheetBinding binding; private String message = ""; private String subMessage = ""; diff --git a/app/src/main/java/com/itsaky/androidide/handlers/IDEHandler.java b/app/src/main/java/com/itsaky/androidide/handlers/IDEHandler.java index 7edd76d2d..8a27d015f 100755 --- a/app/src/main/java/com/itsaky/androidide/handlers/IDEHandler.java +++ b/app/src/main/java/com/itsaky/androidide/handlers/IDEHandler.java @@ -20,7 +20,7 @@ package com.itsaky.androidide.handlers; import com.itsaky.androidide.EditorActivity; import com.itsaky.androidide.project.AndroidProject; import com.itsaky.androidide.project.IDEProject; -import com.itsaky.androidide.utils.Logger; +import com.itsaky.androidide.utils.ILogger; /** * A handler is an implementation that handles a specific feature, data or anything else in @@ -28,7 +28,7 @@ import com.itsaky.androidide.utils.Logger; */ public abstract class IDEHandler { - protected static final Logger LOG = Logger.instance(); + protected static final ILogger LOG = ILogger.instance(); protected Provider provider; diff --git a/app/src/main/java/com/itsaky/androidide/language/CommonCompletionProvider.java b/app/src/main/java/com/itsaky/androidide/language/CommonCompletionProvider.java index bac8f933c..e74f91357 100644 --- a/app/src/main/java/com/itsaky/androidide/language/CommonCompletionProvider.java +++ b/app/src/main/java/com/itsaky/androidide/language/CommonCompletionProvider.java @@ -19,7 +19,7 @@ package com.itsaky.androidide.language; import androidx.annotation.NonNull; -import com.itsaky.androidide.utils.Logger; +import com.itsaky.androidide.utils.ILogger; import com.itsaky.lsp.api.ICompletionProvider; import com.itsaky.lsp.api.ILanguageServer; import com.itsaky.lsp.models.CompletionItem; @@ -66,7 +66,7 @@ public class CommonCompletionProvider { String s2 = p2.getSortText() == null ? p2.getLabel() : p2.getSortText(); return s1.compareTo(s2); }; - private static final Logger LOG = Logger.newInstance("CommonCompletionProvider"); + private static final ILogger LOG = ILogger.newInstance("CommonCompletionProvider"); private final ILanguageServer server; private CompletableFuture future; diff --git a/app/src/main/java/com/itsaky/androidide/language/groovy/GroovyAnalyzer.java b/app/src/main/java/com/itsaky/androidide/language/groovy/GroovyAnalyzer.java index f9c173ac5..e5dad19c1 100755 --- a/app/src/main/java/com/itsaky/androidide/language/groovy/GroovyAnalyzer.java +++ b/app/src/main/java/com/itsaky/androidide/language/groovy/GroovyAnalyzer.java @@ -30,7 +30,7 @@ import static com.itsaky.androidide.syntax.colorschemes.SchemeAndroidIDE.get; import com.itsaky.androidide.lexers.groovy.GroovyLexer; import com.itsaky.androidide.utils.CharSequenceReader; -import com.itsaky.androidide.utils.Logger; +import com.itsaky.androidide.utils.ILogger; import org.antlr.v4.runtime.CharStreams; import org.antlr.v4.runtime.CodePointCharStream; @@ -46,7 +46,7 @@ import io.github.rosemoe.sora.lang.styling.Styles; public class GroovyAnalyzer extends SimpleAnalyzeManager { - private static final Logger LOG = Logger.newInstance("GroovyAnalyzer"); + private static final ILogger LOG = ILogger.newInstance("GroovyAnalyzer"); @Override protected Styles analyze(StringBuilder text, Delegate delegate) { diff --git a/app/src/main/java/com/itsaky/androidide/language/groovy/GroovyLanguage.java b/app/src/main/java/com/itsaky/androidide/language/groovy/GroovyLanguage.java index ba8df8ee1..1cc7e3685 100755 --- a/app/src/main/java/com/itsaky/androidide/language/groovy/GroovyLanguage.java +++ b/app/src/main/java/com/itsaky/androidide/language/groovy/GroovyLanguage.java @@ -24,7 +24,7 @@ import androidx.annotation.NonNull; import com.itsaky.androidide.language.IDELanguage; import com.itsaky.androidide.lexers.groovy.GroovyLexer; import com.itsaky.androidide.utils.CharSequenceReader; -import com.itsaky.androidide.utils.Logger; +import com.itsaky.androidide.utils.ILogger; import org.antlr.v4.runtime.CharStreams; import org.antlr.v4.runtime.Token; @@ -43,7 +43,7 @@ import io.github.rosemoe.sora.widget.SymbolPairMatch; public class GroovyLanguage extends IDELanguage { - private static final Logger LOG = Logger.newInstance("GroovyLanguage"); + private static final ILogger LOG = ILogger.newInstance("GroovyLanguage"); private final GroovyAnalyzer analyzer; private final GroovyAutoComplete completer; private final NewlineHandler[] newlineHandlers = new NewlineHandler[] {new BraceHandler()}; diff --git a/app/src/main/java/com/itsaky/androidide/language/java/JavaAnalyzer.java b/app/src/main/java/com/itsaky/androidide/language/java/JavaAnalyzer.java index a94bc710e..43f8834b5 100644 --- a/app/src/main/java/com/itsaky/androidide/language/java/JavaAnalyzer.java +++ b/app/src/main/java/com/itsaky/androidide/language/java/JavaAnalyzer.java @@ -33,7 +33,7 @@ import com.itsaky.androidide.language.IAnalyzeManager; import com.itsaky.androidide.lexers.java.JavaLexer; import com.itsaky.androidide.syntax.colorschemes.SchemeAndroidIDE; import com.itsaky.androidide.utils.CharSequenceReader; -import com.itsaky.androidide.utils.Logger; +import com.itsaky.androidide.utils.ILogger; import com.itsaky.lsp.models.DiagnosticItem; import com.itsaky.lsp.models.DiagnosticSeverity; import com.itsaky.lsp.models.Position; @@ -62,7 +62,7 @@ import io.github.rosemoe.sora.lang.styling.Styles; */ public class JavaAnalyzer extends SimpleAnalyzeManager implements IAnalyzeManager { - private static final Logger LOG = Logger.newInstance("JavaAnalyzer"); + private static final ILogger LOG = ILogger.newInstance("JavaAnalyzer"); private final List ideDiagnostics = new ArrayList<>(); private List diagnostics = new ArrayList<>(); diff --git a/app/src/main/java/com/itsaky/androidide/language/java/JavaLanguage.java b/app/src/main/java/com/itsaky/androidide/language/java/JavaLanguage.java index 0a34bdc54..3069d8aed 100755 --- a/app/src/main/java/com/itsaky/androidide/language/java/JavaLanguage.java +++ b/app/src/main/java/com/itsaky/androidide/language/java/JavaLanguage.java @@ -26,7 +26,7 @@ import com.itsaky.androidide.language.CommonCompletionProvider; import com.itsaky.androidide.language.IDELanguage; import com.itsaky.androidide.lexers.java.JavaLexer; import com.itsaky.androidide.lexers.java.JavaParser; -import com.itsaky.androidide.utils.Logger; +import com.itsaky.androidide.utils.ILogger; import com.itsaky.androidide.views.editor.IDEEditor; import com.itsaky.lsp.api.ILanguageServer; import com.itsaky.lsp.models.DiagnosticItem; @@ -52,7 +52,7 @@ import io.github.rosemoe.sora.widget.SymbolPairMatch; public class JavaLanguage extends IDELanguage { - private static final Logger LOG = Logger.newInstance("JavaLanguage"); + private static final ILogger LOG = ILogger.newInstance("JavaLanguage"); private final NewlineHandler[] newlineHandlers; private JavaAnalyzer analyzer; private CommonCompletionProvider completer; diff --git a/app/src/main/java/com/itsaky/androidide/language/xml/XMLAnalyzer.java b/app/src/main/java/com/itsaky/androidide/language/xml/XMLAnalyzer.java index b6247bc40..4fdbb56d8 100755 --- a/app/src/main/java/com/itsaky/androidide/language/xml/XMLAnalyzer.java +++ b/app/src/main/java/com/itsaky/androidide/language/xml/XMLAnalyzer.java @@ -26,7 +26,7 @@ import static io.github.rosemoe.sora.widget.schemes.EditorColorScheme.LITERAL; import com.itsaky.androidide.lexers.xml.XMLLexer; import com.itsaky.androidide.syntax.colorschemes.SchemeAndroidIDE; import com.itsaky.androidide.utils.CharSequenceReader; -import com.itsaky.androidide.utils.Logger; +import com.itsaky.androidide.utils.ILogger; import org.antlr.v4.runtime.CharStreams; import org.antlr.v4.runtime.CodePointCharStream; @@ -47,7 +47,7 @@ import io.github.rosemoe.sora.lang.styling.Styles; */ public class XMLAnalyzer extends SimpleAnalyzeManager { - private static final Logger LOG = Logger.newInstance("XMLAnalyzer"); + private static final ILogger LOG = ILogger.newInstance("XMLAnalyzer"); @Override protected Styles analyze(StringBuilder text, Delegate delegate) { diff --git a/app/src/main/java/com/itsaky/androidide/language/xml/XMLLanguage.java b/app/src/main/java/com/itsaky/androidide/language/xml/XMLLanguage.java index 116dec687..4dc8f663e 100755 --- a/app/src/main/java/com/itsaky/androidide/language/xml/XMLLanguage.java +++ b/app/src/main/java/com/itsaky/androidide/language/xml/XMLLanguage.java @@ -26,7 +26,7 @@ import com.itsaky.androidide.language.CommonCompletionProvider; import com.itsaky.androidide.language.IDELanguage; import com.itsaky.androidide.lexers.xml.XMLLexer; import com.itsaky.androidide.utils.JavaCharacter; -import com.itsaky.androidide.utils.Logger; +import com.itsaky.androidide.utils.ILogger; import com.itsaky.androidide.views.editor.IDEEditor; import com.itsaky.lsp.api.ILanguageServer; @@ -47,7 +47,7 @@ import io.github.rosemoe.sora.widget.SymbolPairMatch; public class XMLLanguage extends IDELanguage { - private static final Logger LOG = Logger.newInstance("XMLLanguage"); + private static final ILogger LOG = ILogger.newInstance("XMLLanguage"); private final CommonCompletionProvider completer; private final NewlineHandler[] newlineHandlers; private XMLAnalyzer analyzer; diff --git a/app/src/main/java/com/itsaky/androidide/lsp/IDELanguageClientImpl.java b/app/src/main/java/com/itsaky/androidide/lsp/IDELanguageClientImpl.java index c267b2ed0..6a9d8af6e 100755 --- a/app/src/main/java/com/itsaky/androidide/lsp/IDELanguageClientImpl.java +++ b/app/src/main/java/com/itsaky/androidide/lsp/IDELanguageClientImpl.java @@ -39,7 +39,7 @@ import com.itsaky.androidide.models.SearchResult; import com.itsaky.androidide.tasks.TaskExecutor; import com.itsaky.androidide.utils.DialogUtils; import com.itsaky.androidide.utils.LSPUtils; -import com.itsaky.androidide.utils.Logger; +import com.itsaky.androidide.utils.ILogger; import com.itsaky.androidide.views.editor.CodeEditorView; import com.itsaky.androidide.views.editor.IDEEditor; import com.itsaky.lsp.api.ILanguageClient; @@ -65,7 +65,7 @@ import io.github.rosemoe.sora.text.Content; public class IDELanguageClientImpl implements ILanguageClient { protected static final Gson gson = new Gson(); - protected static final Logger LOG = Logger.newInstance("AbstractLanguageClient"); + protected static final ILogger LOG = ILogger.newInstance("AbstractLanguageClient"); private static IDELanguageClientImpl mInstance; private final Map> diagnostics = new HashMap<>(); protected EditorActivityProvider activityProvider; diff --git a/app/src/main/java/com/itsaky/androidide/project/ProjectResourceTable.java b/app/src/main/java/com/itsaky/androidide/project/ProjectResourceTable.java index 1d6a1ccc6..bc42ab62d 100644 --- a/app/src/main/java/com/itsaky/androidide/project/ProjectResourceTable.java +++ b/app/src/main/java/com/itsaky/androidide/project/ProjectResourceTable.java @@ -20,7 +20,7 @@ package com.itsaky.androidide.project; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.itsaky.androidide.utils.Logger; +import com.itsaky.androidide.utils.ILogger; import com.itsaky.inflater.IResourceTable; import com.itsaky.inflater.values.ValuesTableFactory; @@ -32,7 +32,7 @@ import java.util.Locale; public class ProjectResourceTable implements IResourceTable { - private static final Logger LOG = Logger.newInstance("ProjectResourceFinder"); + private static final ILogger LOG = ILogger.newInstance("ProjectResourceFinder"); private File resDir; private File color; private File layout; diff --git a/app/src/main/java/com/itsaky/androidide/services/LogReceiver.java b/app/src/main/java/com/itsaky/androidide/services/LogReceiver.java index 0d4513104..4c2175a20 100755 --- a/app/src/main/java/com/itsaky/androidide/services/LogReceiver.java +++ b/app/src/main/java/com/itsaky/androidide/services/LogReceiver.java @@ -25,7 +25,7 @@ import android.content.Context; import android.content.Intent; import com.itsaky.androidide.models.LogLine; -import com.itsaky.androidide.utils.Logger; +import com.itsaky.androidide.utils.ILogger; public class LogReceiver extends BroadcastReceiver { @@ -34,7 +34,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.newInstance("LogReceiver"); + private final ILogger LOG = ILogger.newInstance("LogReceiver"); public LogReceiver setLogListener(LogListener listener) { this.listener = listener; diff --git a/app/src/main/java/com/itsaky/androidide/services/builder/IDEService.java b/app/src/main/java/com/itsaky/androidide/services/builder/IDEService.java index db527f4c8..6c1688dbc 100755 --- a/app/src/main/java/com/itsaky/androidide/services/builder/IDEService.java +++ b/app/src/main/java/com/itsaky/androidide/services/builder/IDEService.java @@ -41,7 +41,7 @@ import com.itsaky.androidide.tasks.gradle.BaseGradleTasks; import com.itsaky.androidide.tasks.gradle.resources.UpdateResourceClassesTask; import com.itsaky.androidide.utils.Environment; import com.itsaky.androidide.utils.InputStreamLineReader; -import com.itsaky.androidide.utils.Logger; +import com.itsaky.androidide.utils.ILogger; import com.itsaky.toaster.Toaster; import org.jetbrains.annotations.Contract; @@ -75,7 +75,7 @@ public class IDEService { public static final int TASK_LINT = GradleTask.TASK_LINT; 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.newInstance("IDEService"); + public static final ILogger LOG = ILogger.newInstance("IDEService"); private final File projectRoot; private final IProcessExecutor processExecutor; private BuildListener listener; diff --git a/app/src/main/java/com/itsaky/androidide/tasks/TaskExecutor.java b/app/src/main/java/com/itsaky/androidide/tasks/TaskExecutor.java index 52d038f24..91da942e6 100755 --- a/app/src/main/java/com/itsaky/androidide/tasks/TaskExecutor.java +++ b/app/src/main/java/com/itsaky/androidide/tasks/TaskExecutor.java @@ -19,7 +19,7 @@ package com.itsaky.androidide.tasks; import com.blankj.utilcode.util.ThreadUtils; -import com.itsaky.androidide.utils.Logger; +import com.itsaky.androidide.utils.ILogger; import java.util.concurrent.Callable; import java.util.concurrent.CompletableFuture; @@ -27,7 +27,7 @@ import java.util.concurrent.CompletionException; public class TaskExecutor { - private final Logger LOG = Logger.newInstance("TaskExecutor"); + private final ILogger LOG = ILogger.newInstance("TaskExecutor"); public static void execAsync(Callable callable, Callback callback) { new TaskExecutor().executeAsync(callable, callback); diff --git a/app/src/main/java/com/itsaky/androidide/tasks/gradle/build/ApkGeneratingTask.java b/app/src/main/java/com/itsaky/androidide/tasks/gradle/build/ApkGeneratingTask.java index 483bdac63..efa6f604f 100644 --- a/app/src/main/java/com/itsaky/androidide/tasks/gradle/build/ApkGeneratingTask.java +++ b/app/src/main/java/com/itsaky/androidide/tasks/gradle/build/ApkGeneratingTask.java @@ -27,7 +27,7 @@ import com.itsaky.androidide.app.StudioApp; import com.itsaky.androidide.models.ApkMetadata; import com.itsaky.androidide.tasks.BaseGradleTask; import com.itsaky.androidide.utils.JSONUtility; -import com.itsaky.androidide.utils.Logger; +import com.itsaky.androidide.utils.ILogger; import java.io.File; import java.util.Collections; @@ -37,7 +37,7 @@ import java.util.Set; public abstract class ApkGeneratingTask extends BaseGradleTask { - private static final Logger LOG = Logger.newInstance("ApkGeneratingTask"); + private static final ILogger LOG = ILogger.newInstance("ApkGeneratingTask"); /** * Get the directories where APKs are generated. These directories must contain an diff --git a/app/src/main/java/com/itsaky/androidide/ui/WidgetDragListener.java b/app/src/main/java/com/itsaky/androidide/ui/WidgetDragListener.java index dc64ac3f8..5d2a9671a 100755 --- a/app/src/main/java/com/itsaky/androidide/ui/WidgetDragListener.java +++ b/app/src/main/java/com/itsaky/androidide/ui/WidgetDragListener.java @@ -29,7 +29,7 @@ import com.blankj.utilcode.util.SizeUtils; import com.itsaky.androidide.DesignerActivity; import com.itsaky.androidide.R; import com.itsaky.androidide.models.UIWidget; -import com.itsaky.androidide.utils.Logger; +import com.itsaky.androidide.utils.ILogger; import com.itsaky.inflater.IAttribute; import com.itsaky.inflater.IView; import com.itsaky.inflater.IViewGroup; @@ -57,7 +57,7 @@ public class WidgetDragListener implements View.OnDragListener { public static final String ANDROID_NS = "android"; - private static final Logger LOG = Logger.newInstance("WidgetDragListener"); + private static final ILogger LOG = ILogger.newInstance("WidgetDragListener"); public WidgetDragListener( @NonNull Context context, IViewGroup viewGroup, OnViewAddedListener addedListener) { diff --git a/app/src/main/java/com/itsaky/androidide/utils/EditorBottomSheetBehavior.java b/app/src/main/java/com/itsaky/androidide/utils/EditorBottomSheetBehavior.java index 0fdc19cf4..2873fb93a 100644 --- a/app/src/main/java/com/itsaky/androidide/utils/EditorBottomSheetBehavior.java +++ b/app/src/main/java/com/itsaky/androidide/utils/EditorBottomSheetBehavior.java @@ -32,7 +32,7 @@ import com.itsaky.androidide.databinding.LayoutEditorBottomSheetBinding; public class EditorBottomSheetBehavior extends BottomSheetBehavior { private LayoutEditorBottomSheetBinding binding; - private static final Logger LOG = Logger.newInstance("EditorBottomSheetBehavior"); + private static final ILogger LOG = ILogger.newInstance("EditorBottomSheetBehavior"); public EditorBottomSheetBehavior(Context context, AttributeSet attributeSet) { super(context, attributeSet); diff --git a/app/src/main/java/com/itsaky/androidide/utils/HighlightRangeHelper.java b/app/src/main/java/com/itsaky/androidide/utils/HighlightRangeHelper.java index f3b73649e..7a6d96efc 100644 --- a/app/src/main/java/com/itsaky/androidide/utils/HighlightRangeHelper.java +++ b/app/src/main/java/com/itsaky/androidide/utils/HighlightRangeHelper.java @@ -152,5 +152,5 @@ public class HighlightRangeHelper { return false; } - private static final Logger LOG = Logger.newInstance("HighlightRangeHelper"); + private static final ILogger LOG = ILogger.newInstance("HighlightRangeHelper"); } diff --git a/app/src/main/java/com/itsaky/androidide/utils/RecursiveFileSearcher.java b/app/src/main/java/com/itsaky/androidide/utils/RecursiveFileSearcher.java index 6a6d2bd30..cbf42e3e0 100755 --- a/app/src/main/java/com/itsaky/androidide/utils/RecursiveFileSearcher.java +++ b/app/src/main/java/com/itsaky/androidide/utils/RecursiveFileSearcher.java @@ -46,7 +46,7 @@ import io.github.rosemoe.sora.text.Content; */ public class RecursiveFileSearcher { - private static final Logger logger = Logger.newInstance("RecursiveFileSearcher"); + private static final ILogger logger = ILogger.newInstance("RecursiveFileSearcher"); /** * Search the given text in files recursively in given search directories diff --git a/app/src/main/java/com/itsaky/androidide/views/editor/CodeEditorView.java b/app/src/main/java/com/itsaky/androidide/views/editor/CodeEditorView.java index 45cb54978..ebc5e06b8 100644 --- a/app/src/main/java/com/itsaky/androidide/views/editor/CodeEditorView.java +++ b/app/src/main/java/com/itsaky/androidide/views/editor/CodeEditorView.java @@ -56,7 +56,7 @@ import com.itsaky.androidide.managers.PreferenceManager; import com.itsaky.androidide.models.ConstantsBridge; import com.itsaky.androidide.syntax.colorschemes.SchemeAndroidIDE; import com.itsaky.androidide.utils.LSPUtils; -import com.itsaky.androidide.utils.Logger; +import com.itsaky.androidide.utils.ILogger; import com.itsaky.androidide.utils.TypefaceUtils; import com.itsaky.inflater.values.ValuesTableFactory; import com.itsaky.lsp.models.Range; @@ -84,7 +84,7 @@ import io.github.rosemoe.sora.text.Content; @SuppressLint("ViewConstructor") // This view is always dynamically created. public class CodeEditorView extends FrameLayout { - private static final Logger LOG = Logger.newInstance("CodeEditorView"); + private static final ILogger LOG = ILogger.newInstance("CodeEditorView"); private final File file; private final LayoutCodeEditorBinding binding; private boolean isModified; diff --git a/app/src/main/java/com/itsaky/androidide/views/editor/EditorActionsMenu.kt b/app/src/main/java/com/itsaky/androidide/views/editor/EditorActionsMenu.kt index 4c00c4be3..1421ebed0 100644 --- a/app/src/main/java/com/itsaky/androidide/views/editor/EditorActionsMenu.kt +++ b/app/src/main/java/com/itsaky/androidide/views/editor/EditorActionsMenu.kt @@ -47,7 +47,7 @@ import com.itsaky.androidide.actions.ActionsRegistry.Companion.getInstance import com.itsaky.androidide.actions.editor.SelectAllAction import com.itsaky.androidide.app.StudioApp import com.itsaky.androidide.language.IDELanguage -import com.itsaky.androidide.utils.Logger +import com.itsaky.androidide.utils.ILogger import com.itsaky.lsp.java.JavaLanguageServer import com.itsaky.lsp.models.DiagnosticItem import com.itsaky.lsp.models.Range @@ -81,7 +81,7 @@ open class EditorActionsMenu(val editor: IDEEditor) : private val touchHandler: EditorTouchEventHandler = editor.eventHandler private val receipts: MutableList> = mutableListOf() - private val log = Logger.newInstance(javaClass.simpleName) + private val log = ILogger.newInstance(javaClass.simpleName) private val list: ListView = ListView(editor.context) private var mLastScroll: Long = 0 private var mLastPosition: Int = 0 diff --git a/app/src/main/java/com/itsaky/androidide/views/editor/IDEEditor.java b/app/src/main/java/com/itsaky/androidide/views/editor/IDEEditor.java index dc7bac022..c92a0b073 100644 --- a/app/src/main/java/com/itsaky/androidide/views/editor/IDEEditor.java +++ b/app/src/main/java/com/itsaky/androidide/views/editor/IDEEditor.java @@ -35,7 +35,7 @@ import com.itsaky.androidide.language.IDELanguage; import com.itsaky.androidide.lsp.IDELanguageClientImpl; import com.itsaky.androidide.managers.PreferenceManager; import com.itsaky.androidide.syntax.colorschemes.SchemeAndroidIDE; -import com.itsaky.androidide.utils.Logger; +import com.itsaky.androidide.utils.ILogger; import com.itsaky.lsp.api.ILanguageServer; import com.itsaky.lsp.models.Command; import com.itsaky.lsp.models.DefinitionResult; @@ -71,7 +71,7 @@ import io.github.rosemoe.sora.widget.component.EditorTextActionWindow; public class IDEEditor extends CodeEditor { public static final String KEY_FILE = "editor_file"; - private static final Logger LOG = Logger.newInstance("IDEEditor"); + private static final ILogger LOG = ILogger.newInstance("IDEEditor"); private final EditorActionsMenu mActionsPopup; private IDEEditorSearcher mSearcher; private int mFileVersion; diff --git a/app/src/main/java/com/itsaky/androidide/views/editor/SignatureHelpWindow.java b/app/src/main/java/com/itsaky/androidide/views/editor/SignatureHelpWindow.java index 80f04bd31..e347828c5 100644 --- a/app/src/main/java/com/itsaky/androidide/views/editor/SignatureHelpWindow.java +++ b/app/src/main/java/com/itsaky/androidide/views/editor/SignatureHelpWindow.java @@ -24,7 +24,7 @@ import android.text.style.ForegroundColorSpan; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.itsaky.androidide.utils.Logger; +import com.itsaky.androidide.utils.ILogger; import com.itsaky.lsp.models.SignatureHelp; import com.itsaky.lsp.models.SignatureInformation; @@ -38,7 +38,7 @@ import io.github.rosemoe.sora.widget.base.EditorPopupWindow; */ public class SignatureHelpWindow extends BaseEditorWindow { - private static final Logger LOG = Logger.newInstance("SignatureHelpWindow"); + private static final ILogger LOG = ILogger.newInstance("SignatureHelpWindow"); /** * Create a signature help popup window for editor diff --git a/app/src/main/java/io/github/rosemoe/sora/widget/IDEEditorSearcher.kt b/app/src/main/java/io/github/rosemoe/sora/widget/IDEEditorSearcher.kt index 0426f772a..ced943243 100644 --- a/app/src/main/java/io/github/rosemoe/sora/widget/IDEEditorSearcher.kt +++ b/app/src/main/java/io/github/rosemoe/sora/widget/IDEEditorSearcher.kt @@ -22,7 +22,7 @@ package io.github.rosemoe.sora.widget import android.app.ProgressDialog import android.widget.Toast import com.itsaky.androidide.R.string -import com.itsaky.androidide.utils.Logger +import com.itsaky.androidide.utils.ILogger import com.itsaky.androidide.views.editor.IDEEditor import io.github.rosemoe.sora.text.TextUtils import io.github.rosemoe.sora.util.IntPair @@ -36,7 +36,7 @@ import java.util.concurrent.* */ open class IDEEditorSearcher(editor: IDEEditor) : EditorSearcher(editor) { - private val log = Logger.newInstance(javaClass.simpleName) + private val log = ILogger.newInstance(javaClass.simpleName) protected fun getEditor(): CodeEditor { try { diff --git a/build-tools/logger/src/main/java/com/itsaky/androidide/utils/Logger.java b/build-tools/logger/src/main/java/com/itsaky/androidide/utils/ILogger.java similarity index 90% rename from build-tools/logger/src/main/java/com/itsaky/androidide/utils/Logger.java rename to build-tools/logger/src/main/java/com/itsaky/androidide/utils/ILogger.java index 7f456aff4..f7d831fec 100644 --- a/build-tools/logger/src/main/java/com/itsaky/androidide/utils/Logger.java +++ b/build-tools/logger/src/main/java/com/itsaky/androidide/utils/ILogger.java @@ -48,7 +48,7 @@ import java.util.Objects; * * @author Akash Yadav */ -public class Logger { +public class ILogger { public static final int DEBUG = 0; public static final int WARNING = 1; @@ -57,19 +57,19 @@ public class Logger { public static final int VERBOSE = 4; private static final String MSG_SEPARATOR = " "; // Separate messages with a space. private static final List logListeners = new ArrayList<>(); - private static Logger instance; + private static ILogger instance; private final String TAG; - private Logger(String tag) { + private ILogger (String tag) { TAG = tag; } - public static Logger instance() { + public static ILogger instance() { return instance == null ? instance = createInstance("AndroidIDE") : instance; } - private static Logger createInstance(String tag) { - return new Logger(tag); + private static ILogger createInstance(String tag) { + return new ILogger (tag); } public static void addLogListener(LogListener listener) { @@ -80,7 +80,7 @@ public class Logger { logListeners.remove(Objects.requireNonNull(listener)); } - public static Logger newInstance(String tag) { + public static ILogger newInstance(String tag) { return createInstance(tag); } @@ -116,7 +116,7 @@ public class Logger { } } - public Logger warn(Object... messages) { + public ILogger warn(Object... messages) { final var msg = generateMessage(messages); Log.w(TAG, msg); notifyListener(WARNING, msg); @@ -145,21 +145,21 @@ public class Logger { } } - public Logger error(Object... messages) { + public ILogger error(Object... messages) { final var msg = generateMessage(messages); Log.e(TAG, msg); notifyListener(ERROR, msg); return this; } - public Logger verbose(Object... messages) { + public ILogger verbose(Object... messages) { final var msg = generateMessage(messages); Log.v(TAG, msg); notifyListener(VERBOSE, msg); return this; } - public Logger info(Object... messages) { + public ILogger info(Object... messages) { final var msg = generateMessage(messages); Log.i(TAG, msg); notifyListener(INFO, msg); @@ -171,7 +171,7 @@ public class Logger { debug(getCallerClassDescription()); } - public Logger debug(Object... messages) { + public ILogger debug(Object... messages) { final var msg = generateMessage(messages); Log.d(TAG, msg); notifyListener(DEBUG, msg); @@ -184,7 +184,7 @@ public class Logger { final var element = elements[i]; final var klass = element.getClassName(); final var method = element.getMethodName(); - if (Logger.class.getName().equals(klass) || klass.contains("java.lang.Thread")) { + if (ILogger.class.getName().equals(klass) || klass.contains("java.lang.Thread")) { continue; } diff --git a/build-tools/logger/src/main/java/com/itsaky/androidide/utils/LogUtils.java b/build-tools/logger/src/main/java/com/itsaky/androidide/utils/LogUtils.java index 8835042c5..ce7f6ed90 100644 --- a/build-tools/logger/src/main/java/com/itsaky/androidide/utils/LogUtils.java +++ b/build-tools/logger/src/main/java/com/itsaky/androidide/utils/LogUtils.java @@ -24,7 +24,7 @@ import java.util.List; import java.util.StringTokenizer; /** - * Utility class for {@link Logger}. + * Utility class for {@link ILogger}. * * @author Akash Yadav */ diff --git a/build-tools/logger/src/main/java/com/itsaky/androidide/utils/LoggerImpl.java b/build-tools/logger/src/main/java/com/itsaky/androidide/utils/LoggerImpl.java new file mode 100644 index 000000000..65b10f4ac --- /dev/null +++ b/build-tools/logger/src/main/java/com/itsaky/androidide/utils/LoggerImpl.java @@ -0,0 +1,25 @@ +/* + * This file is part of AndroidIDE. + * + * AndroidIDE is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * AndroidIDE is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with AndroidIDE. If not, see . + */ + +package com.itsaky.androidide.utils; + +/** + * {@link ILogger} implementation for the Android Runtime (ART). + * + * @author Akash Yadav + */ +public class LoggerImpl {} diff --git a/common/src/main/java/com/itsaky/androidide/colorpicker/ColorPickerView.java b/common/src/main/java/com/itsaky/androidide/colorpicker/ColorPickerView.java index 4b8efdaa9..4ab781efd 100644 --- a/common/src/main/java/com/itsaky/androidide/colorpicker/ColorPickerView.java +++ b/common/src/main/java/com/itsaky/androidide/colorpicker/ColorPickerView.java @@ -39,7 +39,7 @@ import androidx.core.content.ContextCompat; import com.google.android.material.slider.Slider; import com.itsaky.androidide.common.R; import com.itsaky.androidide.common.databinding.LayoutColorPickerBinding; -import com.itsaky.androidide.utils.Logger; +import com.itsaky.androidide.utils.ILogger; /** * A color picker view. @@ -57,7 +57,7 @@ public class ColorPickerView extends LinearLayout { private final LayoutColorPickerBinding binding; private final int DEFAULT_COLOR; - private static final Logger LOG = Logger.newInstance("ColorPickerView"); + private static final ILogger LOG = ILogger.newInstance("ColorPickerView"); private final Slider.OnChangeListener mValueChangeListener = (slider, value, fromUser) -> { diff --git a/common/src/main/java/com/itsaky/androidide/managers/ToolsManager.java b/common/src/main/java/com/itsaky/androidide/managers/ToolsManager.java index f6cb58c5b..bf4a49c81 100755 --- a/common/src/main/java/com/itsaky/androidide/managers/ToolsManager.java +++ b/common/src/main/java/com/itsaky/androidide/managers/ToolsManager.java @@ -25,7 +25,7 @@ import com.blankj.utilcode.util.ResourceUtils; import com.blankj.utilcode.util.ZipUtils; import com.itsaky.androidide.app.BaseApplication; import com.itsaky.androidide.utils.Environment; -import com.itsaky.androidide.utils.Logger; +import com.itsaky.androidide.utils.ILogger; import org.jetbrains.annotations.Contract; @@ -36,7 +36,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.newInstance("ToolsManager"); + private static final ILogger LOG = ILogger.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; diff --git a/common/src/main/java/com/itsaky/androidide/shell/ShellServer.java b/common/src/main/java/com/itsaky/androidide/shell/ShellServer.java index 8d56d3314..04e0fb10f 100755 --- a/common/src/main/java/com/itsaky/androidide/shell/ShellServer.java +++ b/common/src/main/java/com/itsaky/androidide/shell/ShellServer.java @@ -21,7 +21,7 @@ package com.itsaky.androidide.shell; import androidx.annotation.NonNull; -import com.itsaky.androidide.utils.Logger; +import com.itsaky.androidide.utils.ILogger; import java.io.BufferedReader; import java.io.Closeable; @@ -40,7 +40,7 @@ public class ShellServer extends Thread { private BufferedReader output; private Process process; - private static final Logger LOG = Logger.newInstance("ShellServer"); + private static final ILogger LOG = ILogger.newInstance("ShellServer"); public ShellServer( Callback callback, diff --git a/common/src/main/java/com/itsaky/androidide/utils/BootstrapInstaller.java b/common/src/main/java/com/itsaky/androidide/utils/BootstrapInstaller.java index 5c2204f58..c7319b57b 100644 --- a/common/src/main/java/com/itsaky/androidide/utils/BootstrapInstaller.java +++ b/common/src/main/java/com/itsaky/androidide/utils/BootstrapInstaller.java @@ -53,7 +53,7 @@ import java.util.zip.ZipInputStream; */ public class BootstrapInstaller { - private static final Logger LOG = Logger.newInstance("BootstrapInstaller"); + private static final ILogger LOG = ILogger.newInstance("BootstrapInstaller"); @NonNull public static CompletableFuture doInstall( diff --git a/common/src/main/java/com/itsaky/androidide/utils/Environment.java b/common/src/main/java/com/itsaky/androidide/utils/Environment.java index 8402e52b3..1b6d26c46 100755 --- a/common/src/main/java/com/itsaky/androidide/utils/Environment.java +++ b/common/src/main/java/com/itsaky/androidide/utils/Environment.java @@ -43,7 +43,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.newInstance("Environment"); + private static final ILogger LOG = ILogger.newInstance("Environment"); private static final List blacklist = new ArrayList<>(); public static File ROOT; public static File SYSROOT; diff --git a/common/src/main/java/com/itsaky/androidide/utils/StopWatch.kt b/common/src/main/java/com/itsaky/androidide/utils/StopWatch.kt index f758b65c4..c7f94ebe5 100644 --- a/common/src/main/java/com/itsaky/androidide/utils/StopWatch.kt +++ b/common/src/main/java/com/itsaky/androidide/utils/StopWatch.kt @@ -25,7 +25,7 @@ package com.itsaky.androidide.utils * @author Akash Yadav */ class StopWatch(val label: String, val start: Long = System.currentTimeMillis()) { - private val log = Logger.newInstance(javaClass.simpleName) + private val log = ILogger.newInstance(javaClass.simpleName) fun log() { log.debug("$label completed in ${System.currentTimeMillis() - start}ms") diff --git a/lsp/api/src/main/java/com/itsaky/lsp/models/Completions.kt b/lsp/api/src/main/java/com/itsaky/lsp/models/Completions.kt index 995bcc042..75c3b54ee 100644 --- a/lsp/api/src/main/java/com/itsaky/lsp/models/Completions.kt +++ b/lsp/api/src/main/java/com/itsaky/lsp/models/Completions.kt @@ -17,7 +17,7 @@ package com.itsaky.lsp.models -import com.itsaky.androidide.utils.Logger +import com.itsaky.androidide.utils.ILogger import io.github.rosemoe.sora.text.Content import io.github.rosemoe.sora.widget.CodeEditor import java.nio.file.Path @@ -66,7 +66,7 @@ data class CompletionItem( constructor() : this("", "", null, null, null, null, CompletionItemKind.NONE, ArrayList(), null) companion object { - private val LOG = Logger.newInstance("CompletionItem") + private val LOG = ILogger.newInstance("CompletionItem") } fun setLabel(label: String) { diff --git a/lsp/api/src/main/java/com/itsaky/lsp/util/LSPEditorActions.java b/lsp/api/src/main/java/com/itsaky/lsp/util/LSPEditorActions.java index 90c47432e..57aaaca69 100644 --- a/lsp/api/src/main/java/com/itsaky/lsp/util/LSPEditorActions.java +++ b/lsp/api/src/main/java/com/itsaky/lsp/util/LSPEditorActions.java @@ -17,11 +17,11 @@ package com.itsaky.lsp.util; -import static com.itsaky.androidide.utils.Logger.newInstance; +import static com.itsaky.androidide.utils.ILogger.newInstance; import com.itsaky.androidide.actions.ActionItem; import com.itsaky.androidide.actions.ActionsRegistry; -import com.itsaky.androidide.utils.Logger; +import com.itsaky.androidide.utils.ILogger; import com.itsaky.lsp.actions.CodeActionsMenu; /** @@ -29,7 +29,7 @@ import com.itsaky.lsp.actions.CodeActionsMenu; */ public class LSPEditorActions { - private static final Logger LOG = newInstance("LSPEditorActions"); + private static final ILogger LOG = newInstance("LSPEditorActions"); public static void ensureActionsMenuRegistered(Class klass) { final var registry = ActionsRegistry.getInstance(); diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/FileStore.java b/lsp/java/src/main/java/com/itsaky/lsp/java/FileStore.java index de2661210..c93c0f265 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/FileStore.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/FileStore.java @@ -6,7 +6,7 @@ import androidx.annotation.NonNull; import com.itsaky.androidide.utils.CharSequenceInputStream; import com.itsaky.androidide.utils.CharSequenceReader; -import com.itsaky.androidide.utils.Logger; +import com.itsaky.androidide.utils.ILogger; import com.itsaky.lsp.java.utils.StringSearch; import com.itsaky.lsp.models.DocumentChangeEvent; import com.itsaky.lsp.models.DocumentCloseEvent; @@ -48,7 +48,7 @@ public class FileStore { // TODO organize by package name for speed of list(...) private static final TreeMap javaSources = new TreeMap<>(); - private static final Logger LOG = Logger.newInstance("FileStore"); + private static final ILogger LOG = ILogger.newInstance("FileStore"); public static void shutdown() { workspaceRoots.clear(); diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/JavaLanguageServer.java b/lsp/java/src/main/java/com/itsaky/lsp/java/JavaLanguageServer.java index 85c6d7510..0f086a3f2 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/JavaLanguageServer.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/JavaLanguageServer.java @@ -21,7 +21,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.RestrictTo; -import com.itsaky.androidide.utils.Logger; +import com.itsaky.androidide.utils.ILogger; import com.itsaky.lsp.api.ICompletionProvider; import com.itsaky.lsp.api.IDocumentHandler; import com.itsaky.lsp.api.ILanguageClient; @@ -66,7 +66,7 @@ import java.util.concurrent.CompletableFuture; public class JavaLanguageServer implements ILanguageServer, IDocumentHandler { - private static final Logger LOG = Logger.newInstance("JavaLanguageServer"); + private static final ILogger LOG = ILogger.newInstance("JavaLanguageServer"); private final AnalyzeTimer analyzeTimer; private ILanguageClient client; private IServerSettings settings; diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/actions/FieldBasedAction.kt b/lsp/java/src/main/java/com/itsaky/lsp/java/actions/FieldBasedAction.kt index 2fd5b855c..089f8bfe6 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/actions/FieldBasedAction.kt +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/actions/FieldBasedAction.kt @@ -20,7 +20,7 @@ package com.itsaky.lsp.java.actions import android.content.Context import com.itsaky.androidide.actions.ActionData import com.itsaky.androidide.app.BaseApplication -import com.itsaky.androidide.utils.Logger +import com.itsaky.androidide.utils.ILogger import com.itsaky.lsp.java.JavaLanguageServer import com.itsaky.lsp.java.R import com.itsaky.lsp.java.compiler.CompileTask @@ -42,7 +42,7 @@ import javax.lang.model.element.Modifier.STATIC */ abstract class FieldBasedAction : BaseCodeAction() { - private val log = Logger.newInstance(javaClass.simpleName) + private val log = ILogger.newInstance(javaClass.simpleName) override fun prepare(data: ActionData) { super.prepare(data) diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/actions/common/FindReferencesAction.kt b/lsp/java/src/main/java/com/itsaky/lsp/java/actions/common/FindReferencesAction.kt index fd15e4197..28ee3dfda 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/actions/common/FindReferencesAction.kt +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/actions/common/FindReferencesAction.kt @@ -17,7 +17,7 @@ package com.itsaky.lsp.java.actions.common import com.itsaky.androidide.actions.ActionData -import com.itsaky.androidide.utils.Logger +import com.itsaky.androidide.utils.ILogger import com.itsaky.lsp.java.R import com.itsaky.lsp.java.actions.BaseCodeAction import io.github.rosemoe.sora.widget.CodeEditor @@ -33,7 +33,7 @@ class FindReferencesAction : BaseCodeAction() { override val id: String = "lsp_java_findReferences" override var label: String = "Find references" override var requiresUIThread: Boolean = true - private val log = Logger.newInstance(javaClass.simpleName) + private val log = ILogger.newInstance(javaClass.simpleName) override fun prepare(data: ActionData) { super.prepare(data) diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/actions/common/GoToDefinitionAction.kt b/lsp/java/src/main/java/com/itsaky/lsp/java/actions/common/GoToDefinitionAction.kt index 51f6fac6c..a82280901 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/actions/common/GoToDefinitionAction.kt +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/actions/common/GoToDefinitionAction.kt @@ -17,7 +17,7 @@ package com.itsaky.lsp.java.actions.common import com.itsaky.androidide.actions.ActionData -import com.itsaky.androidide.utils.Logger +import com.itsaky.androidide.utils.ILogger import com.itsaky.lsp.java.R import com.itsaky.lsp.java.actions.BaseCodeAction import io.github.rosemoe.sora.widget.CodeEditor @@ -34,7 +34,7 @@ class GoToDefinitionAction : BaseCodeAction() { override val id: String = "lsp_java_gotoDefinition" override var label: String = "Go to definition" override var requiresUIThread: Boolean = true - private val log = Logger.newInstance(javaClass.simpleName) + private val log = ILogger.newInstance(javaClass.simpleName) override fun prepare(data: ActionData) { super.prepare(data) diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/actions/diagnostics/AddImportAction.kt b/lsp/java/src/main/java/com/itsaky/lsp/java/actions/diagnostics/AddImportAction.kt index 39316dde8..e8a034d7e 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/actions/diagnostics/AddImportAction.kt +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/actions/diagnostics/AddImportAction.kt @@ -18,7 +18,7 @@ package com.itsaky.lsp.java.actions.diagnostics import com.google.common.collect.Iterables.toArray import com.itsaky.androidide.actions.ActionData -import com.itsaky.androidide.utils.Logger +import com.itsaky.androidide.utils.ILogger import com.itsaky.lsp.java.JavaLanguageServer import com.itsaky.lsp.java.R import com.itsaky.lsp.java.actions.BaseCodeAction @@ -37,7 +37,7 @@ class AddImportAction() : BaseCodeAction() { override val id: String = "lsp_java_addImport" override var label: String = "Import class(es)" private val diagnosticCode = DiagnosticCode.NOT_IMPORTED.id - private val log = Logger.newInstance("AddImportAction") + private val log = ILogger.newInstance("AddImportAction") override val titleTextRes: Int = R.string.action_import_classes diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/actions/diagnostics/AddThrowsAction.kt b/lsp/java/src/main/java/com/itsaky/lsp/java/actions/diagnostics/AddThrowsAction.kt index 65afbfe3b..8566c4814 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/actions/diagnostics/AddThrowsAction.kt +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/actions/diagnostics/AddThrowsAction.kt @@ -17,7 +17,7 @@ package com.itsaky.lsp.java.actions.diagnostics import com.itsaky.androidide.actions.ActionData -import com.itsaky.androidide.utils.Logger +import com.itsaky.androidide.utils.ILogger import com.itsaky.lsp.java.JavaLanguageServer import com.itsaky.lsp.java.R import com.itsaky.lsp.java.actions.BaseCodeAction @@ -31,7 +31,7 @@ class AddThrowsAction : BaseCodeAction() { override val id = "lsp_java_addThrows" override var label: String = "" private val diagnosticCode = DiagnosticCode.NOT_THROWN.id - private val log = Logger.newInstance(javaClass.simpleName) + private val log = ILogger.newInstance(javaClass.simpleName) override val titleTextRes: Int = R.string.action_add_throws diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/actions/diagnostics/CreateMissingMethodAction.kt b/lsp/java/src/main/java/com/itsaky/lsp/java/actions/diagnostics/CreateMissingMethodAction.kt index a334f326c..c8fdad847 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/actions/diagnostics/CreateMissingMethodAction.kt +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/actions/diagnostics/CreateMissingMethodAction.kt @@ -17,7 +17,7 @@ package com.itsaky.lsp.java.actions.diagnostics import com.itsaky.androidide.actions.ActionData -import com.itsaky.androidide.utils.Logger +import com.itsaky.androidide.utils.ILogger import com.itsaky.lsp.java.JavaLanguageServer import com.itsaky.lsp.java.R import com.itsaky.lsp.java.actions.BaseCodeAction @@ -31,7 +31,7 @@ class CreateMissingMethodAction : BaseCodeAction() { override val id: String = "lsp_java_createMissingMethod" override var label: String = "" private val diagnosticCode = DiagnosticCode.MISSING_METHOD.id - private val log = Logger.newInstance(javaClass.simpleName) + private val log = ILogger.newInstance(javaClass.simpleName) override val titleTextRes: Int = R.string.action_create_missing_method diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/actions/diagnostics/FieldToBlockAction.kt b/lsp/java/src/main/java/com/itsaky/lsp/java/actions/diagnostics/FieldToBlockAction.kt index 0fc67fc7c..813331a5e 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/actions/diagnostics/FieldToBlockAction.kt +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/actions/diagnostics/FieldToBlockAction.kt @@ -17,7 +17,7 @@ package com.itsaky.lsp.java.actions.diagnostics import com.itsaky.androidide.actions.ActionData -import com.itsaky.androidide.utils.Logger +import com.itsaky.androidide.utils.ILogger import com.itsaky.lsp.java.JavaLanguageServer import com.itsaky.lsp.java.R import com.itsaky.lsp.java.actions.BaseCodeAction @@ -32,7 +32,7 @@ class FieldToBlockAction : BaseCodeAction() { override val id: String = "lsp_java_fieldToBlock" override var label: String = "" private val diagnosticCode = DiagnosticCode.UNUSED_FIELD.id - private val log = Logger.newInstance(javaClass.simpleName) + private val log = ILogger.newInstance(javaClass.simpleName) override val titleTextRes: Int = R.string.action_convert_to_block diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/actions/diagnostics/ImplementAbstractMethodsAction.kt b/lsp/java/src/main/java/com/itsaky/lsp/java/actions/diagnostics/ImplementAbstractMethodsAction.kt index 86ac5c254..af2b3033b 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/actions/diagnostics/ImplementAbstractMethodsAction.kt +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/actions/diagnostics/ImplementAbstractMethodsAction.kt @@ -17,7 +17,7 @@ package com.itsaky.lsp.java.actions.diagnostics import com.itsaky.androidide.actions.ActionData -import com.itsaky.androidide.utils.Logger +import com.itsaky.androidide.utils.ILogger import com.itsaky.lsp.java.JavaLanguageServer import com.itsaky.lsp.java.R import com.itsaky.lsp.java.actions.BaseCodeAction @@ -34,7 +34,7 @@ class ImplementAbstractMethodsAction : BaseCodeAction() { override val id: String = "lsp_java_implementAbstractMethods" override var label: String = "" private var diagnosticCode = DiagnosticCode.DOES_NOT_OVERRIDE_ABSTRACT.id - private val log = Logger.newInstance(javaClass.simpleName) + private val log = ILogger.newInstance(javaClass.simpleName) override val titleTextRes: Int = R.string.action_implement_abstract_methods diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/actions/diagnostics/RemoveClassAction.kt b/lsp/java/src/main/java/com/itsaky/lsp/java/actions/diagnostics/RemoveClassAction.kt index fe3f2aca6..3396b0c43 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/actions/diagnostics/RemoveClassAction.kt +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/actions/diagnostics/RemoveClassAction.kt @@ -17,7 +17,7 @@ package com.itsaky.lsp.java.actions.diagnostics import com.itsaky.androidide.actions.ActionData -import com.itsaky.androidide.utils.Logger +import com.itsaky.androidide.utils.ILogger import com.itsaky.lsp.java.JavaLanguageServer import com.itsaky.lsp.java.R import com.itsaky.lsp.java.actions.BaseCodeAction @@ -31,7 +31,7 @@ class RemoveClassAction : BaseCodeAction() { override val id: String = "lsp_java_removeClass" override var label: String = "" private val diagnosticCode = DiagnosticCode.UNUSED_CLASS.id - private val log = Logger.newInstance(javaClass.simpleName) + private val log = ILogger.newInstance(javaClass.simpleName) override val titleTextRes: Int = R.string.action_remove_class diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/actions/diagnostics/RemoveMethodAction.kt b/lsp/java/src/main/java/com/itsaky/lsp/java/actions/diagnostics/RemoveMethodAction.kt index 186386dae..c57b3a210 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/actions/diagnostics/RemoveMethodAction.kt +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/actions/diagnostics/RemoveMethodAction.kt @@ -17,7 +17,7 @@ package com.itsaky.lsp.java.actions.diagnostics import com.itsaky.androidide.actions.ActionData -import com.itsaky.androidide.utils.Logger +import com.itsaky.androidide.utils.ILogger import com.itsaky.lsp.java.JavaLanguageServer import com.itsaky.lsp.java.R import com.itsaky.lsp.java.actions.BaseCodeAction @@ -31,7 +31,7 @@ class RemoveMethodAction : BaseCodeAction() { override val id: String = "lsp_java_removeMethod" override var label: String = "" private val diagnosticCode = DiagnosticCode.UNUSED_METHOD.id - private val log = Logger.newInstance(javaClass.simpleName) + private val log = ILogger.newInstance(javaClass.simpleName) override val titleTextRes: Int = R.string.action_remove_method diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/actions/diagnostics/RemoveUnusedThrowsAction.kt b/lsp/java/src/main/java/com/itsaky/lsp/java/actions/diagnostics/RemoveUnusedThrowsAction.kt index 0a1b157a2..20ba3ccae 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/actions/diagnostics/RemoveUnusedThrowsAction.kt +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/actions/diagnostics/RemoveUnusedThrowsAction.kt @@ -17,7 +17,7 @@ package com.itsaky.lsp.java.actions.diagnostics import com.itsaky.androidide.actions.ActionData -import com.itsaky.androidide.utils.Logger +import com.itsaky.androidide.utils.ILogger import com.itsaky.lsp.java.JavaLanguageServer import com.itsaky.lsp.java.R import com.itsaky.lsp.java.actions.BaseCodeAction @@ -31,7 +31,7 @@ class RemoveUnusedThrowsAction : BaseCodeAction() { override val id: String = "lsp_java_removeUnusedThrows" override var label: String = "" private val diagnosticCode = DiagnosticCode.UNUSED_THROWS.id - private val log = Logger.newInstance(javaClass.simpleName) + private val log = ILogger.newInstance(javaClass.simpleName) override val titleTextRes: Int = R.string.action_remove_unused_throws diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/actions/diagnostics/SuppressUncheckedWarningAction.kt b/lsp/java/src/main/java/com/itsaky/lsp/java/actions/diagnostics/SuppressUncheckedWarningAction.kt index 8cfb28522..5bdbbf9f0 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/actions/diagnostics/SuppressUncheckedWarningAction.kt +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/actions/diagnostics/SuppressUncheckedWarningAction.kt @@ -17,7 +17,7 @@ package com.itsaky.lsp.java.actions.diagnostics import com.itsaky.androidide.actions.ActionData -import com.itsaky.androidide.utils.Logger +import com.itsaky.androidide.utils.ILogger import com.itsaky.lsp.java.JavaLanguageServer import com.itsaky.lsp.java.R import com.itsaky.lsp.java.actions.BaseCodeAction @@ -31,7 +31,7 @@ class SuppressUncheckedWarningAction : BaseCodeAction() { override val id = "lsp_java_suppressUncheckedWarning" override var label: String = "" private val diagnosticCode = DiagnosticCode.UNCHECKED.id - private val log = Logger.newInstance(javaClass.simpleName) + private val log = ILogger.newInstance(javaClass.simpleName) override val titleTextRes: Int = R.string.action_suppress_unchecked_warning diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/actions/diagnostics/VariableToStatementAction.kt b/lsp/java/src/main/java/com/itsaky/lsp/java/actions/diagnostics/VariableToStatementAction.kt index f66890223..5991b6b02 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/actions/diagnostics/VariableToStatementAction.kt +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/actions/diagnostics/VariableToStatementAction.kt @@ -17,7 +17,7 @@ package com.itsaky.lsp.java.actions.diagnostics import com.itsaky.androidide.actions.ActionData -import com.itsaky.androidide.utils.Logger +import com.itsaky.androidide.utils.ILogger import com.itsaky.lsp.java.JavaLanguageServer import com.itsaky.lsp.java.R import com.itsaky.lsp.java.actions.BaseCodeAction @@ -32,7 +32,7 @@ class VariableToStatementAction : BaseCodeAction() { override val id: String = "lsp_java_variableToStatement" override var label: String = "" private val diagnosticCode = DiagnosticCode.UNUSED_LOCAL.id - private val log = Logger.newInstance(javaClass.simpleName) + private val log = ILogger.newInstance(javaClass.simpleName) override val titleTextRes: Int = R.string.action_convert_to_statement diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/actions/generators/GenerateConstructorAction.kt b/lsp/java/src/main/java/com/itsaky/lsp/java/actions/generators/GenerateConstructorAction.kt index f58007767..2da1839d8 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/actions/generators/GenerateConstructorAction.kt +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/actions/generators/GenerateConstructorAction.kt @@ -24,7 +24,7 @@ import com.github.javaparser.ast.Modifier import com.github.javaparser.ast.body.ConstructorDeclaration import com.itsaky.androidide.actions.ActionData import com.itsaky.androidide.app.BaseApplication -import com.itsaky.androidide.utils.Logger +import com.itsaky.androidide.utils.ILogger import com.itsaky.androidide.utils.StopWatch import com.itsaky.lsp.java.JavaLanguageServer import com.itsaky.lsp.java.R.string @@ -168,5 +168,5 @@ class GenerateConstructorAction : FieldBasedAction() { override val titleTextRes: Int = string.action_generate_constructor override val id: String = "lsp_java_generateConstructor" override var label: String = "" - private val log = Logger.newInstance(javaClass.simpleName) + private val log = ILogger.newInstance(javaClass.simpleName) } diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/actions/generators/GenerateMissingConstructorAction.kt b/lsp/java/src/main/java/com/itsaky/lsp/java/actions/generators/GenerateMissingConstructorAction.kt index 1327c82c0..3a174af78 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/actions/generators/GenerateMissingConstructorAction.kt +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/actions/generators/GenerateMissingConstructorAction.kt @@ -17,7 +17,7 @@ package com.itsaky.lsp.java.actions.generators import com.itsaky.androidide.actions.ActionData -import com.itsaky.androidide.utils.Logger +import com.itsaky.androidide.utils.ILogger import com.itsaky.lsp.java.JavaLanguageServer import com.itsaky.lsp.java.R import com.itsaky.lsp.java.actions.BaseCodeAction @@ -31,7 +31,7 @@ class GenerateMissingConstructorAction : BaseCodeAction() { override val id = "lsp_java_generateMissingConstructor" override var label: String = "" private val diagnosticCode = DiagnosticCode.MISSING_CONSTRUCTOR.id - private val log = Logger.newInstance(javaClass.simpleName) + private val log = ILogger.newInstance(javaClass.simpleName) override val titleTextRes: Int = R.string.action_generate_missing_constructor override fun prepare(data: ActionData) { diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/actions/generators/GenerateSettersAndGettersAction.kt b/lsp/java/src/main/java/com/itsaky/lsp/java/actions/generators/GenerateSettersAndGettersAction.kt index 2c6162b83..2567e2dab 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/actions/generators/GenerateSettersAndGettersAction.kt +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/actions/generators/GenerateSettersAndGettersAction.kt @@ -24,7 +24,7 @@ import com.github.javaparser.ast.expr.SimpleName import com.github.javaparser.ast.type.VoidType import com.itsaky.androidide.actions.ActionData import com.itsaky.androidide.app.BaseApplication -import com.itsaky.androidide.utils.Logger +import com.itsaky.androidide.utils.ILogger import com.itsaky.lsp.java.JavaLanguageServer import com.itsaky.lsp.java.R import com.itsaky.lsp.java.actions.FieldBasedAction @@ -51,7 +51,7 @@ import javax.lang.model.element.VariableElement class GenerateSettersAndGettersAction : FieldBasedAction() { override val id: String = "lsp_java_generateSettersAndGetters" override var label: String = "" - private val log = Logger.newInstance(javaClass.simpleName) + private val log = ILogger.newInstance(javaClass.simpleName) override val titleTextRes: Int = R.string.action_generate_setters_getters diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/actions/generators/GenerateToStringMethodAction.kt b/lsp/java/src/main/java/com/itsaky/lsp/java/actions/generators/GenerateToStringMethodAction.kt index 20da7b1bb..22e6ae2ab 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/actions/generators/GenerateToStringMethodAction.kt +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/actions/generators/GenerateToStringMethodAction.kt @@ -24,7 +24,7 @@ import com.github.javaparser.ast.body.MethodDeclaration import com.github.javaparser.ast.stmt.ReturnStmt import com.itsaky.androidide.actions.ActionData import com.itsaky.androidide.app.BaseApplication -import com.itsaky.androidide.utils.Logger +import com.itsaky.androidide.utils.ILogger import com.itsaky.lsp.java.JavaLanguageServer import com.itsaky.lsp.java.R import com.itsaky.lsp.java.R.string @@ -57,7 +57,7 @@ class GenerateToStringMethodAction : FieldBasedAction() { override val id: String = "lsp_java_generateToString" override var label: String = "" - private val log = Logger.newInstance(javaClass.simpleName) + private val log = ILogger.newInstance(javaClass.simpleName) override fun onGetFields(fields: List, data: ActionData) { showFieldSelector(fields, data) { selected -> diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/actions/generators/OverrideSuperclassMethodsAction.kt b/lsp/java/src/main/java/com/itsaky/lsp/java/actions/generators/OverrideSuperclassMethodsAction.kt index 868430593..8ce51ba9e 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/actions/generators/OverrideSuperclassMethodsAction.kt +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/actions/generators/OverrideSuperclassMethodsAction.kt @@ -20,7 +20,7 @@ import android.content.Context import com.blankj.utilcode.util.ThreadUtils import com.itsaky.androidide.actions.ActionData import com.itsaky.androidide.app.BaseApplication -import com.itsaky.androidide.utils.Logger +import com.itsaky.androidide.utils.ILogger import com.itsaky.lsp.java.JavaLanguageServer import com.itsaky.lsp.java.R import com.itsaky.lsp.java.actions.BaseCodeAction @@ -58,7 +58,7 @@ class OverrideSuperclassMethodsAction : BaseCodeAction() { override val titleTextRes: Int = R.string.action_override_superclass_methods override val id: String = "lsp_java_overrideSuperclassMethods" override var label: String = "Override superclass methods" - private val log = Logger.newInstance(javaClass.simpleName) + private val log = ILogger.newInstance(javaClass.simpleName) private var position: Long = -1 override fun prepare(data: ActionData) { diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/compiler/CompileBatch.java b/lsp/java/src/main/java/com/itsaky/lsp/java/compiler/CompileBatch.java index 950ad83d5..beff9f95c 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/compiler/CompileBatch.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/compiler/CompileBatch.java @@ -18,15 +18,13 @@ package com.itsaky.lsp.java.compiler; import com.itsaky.androidide.utils.Environment; -import com.itsaky.androidide.utils.Logger; +import com.itsaky.androidide.utils.ILogger; import com.itsaky.lsp.java.FileStore; import com.itsaky.lsp.java.parser.Parser; import com.sun.source.tree.CompilationUnitTree; -import com.sun.source.util.JavacTask; import com.sun.tools.javac.api.JavacTaskImpl; import java.io.File; -import java.io.IOException; import java.nio.file.Path; import java.nio.file.Paths; import java.util.ArrayList; @@ -44,7 +42,7 @@ import javax.tools.JavaFileObject; public class CompileBatch implements AutoCloseable { - private static final Logger LOG = Logger.newInstance("CompileBatch"); + private static final ILogger LOG = ILogger.newInstance("CompileBatch"); private static final Path FILE_NOT_FOUND = Paths.get(""); final JavaCompilerService parent; final ReusableCompiler.Borrow borrow; diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/compiler/JavaCompilerService.java b/lsp/java/src/main/java/com/itsaky/lsp/java/compiler/JavaCompilerService.java index 74bea4a78..f2fd5593e 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/compiler/JavaCompilerService.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/compiler/JavaCompilerService.java @@ -17,7 +17,7 @@ package com.itsaky.lsp.java.compiler; -import com.itsaky.androidide.utils.Logger; +import com.itsaky.androidide.utils.ILogger; import com.itsaky.lsp.java.FileStore; import com.itsaky.lsp.java.parser.ParseTask; import com.itsaky.lsp.java.parser.Parser; @@ -53,7 +53,7 @@ public class JavaCompilerService implements CompilerProvider { private static final Cache cacheContainsWord = new Cache<>(); private static final Cache> cacheContainsType = new Cache<>(); - private static final Logger LOG = Logger.newInstance("JavaCompilerService"); + private static final ILogger LOG = ILogger.newInstance("JavaCompilerService"); protected final ScanClassPath classPathScanner = new ScanClassPath(); protected final Set classPath, docPath; protected final Set jdkClasses = classPathScanner.jdkTopLevelClasses(), diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/compiler/ReusableCompiler.java b/lsp/java/src/main/java/com/itsaky/lsp/java/compiler/ReusableCompiler.java index d3d4faf9e..500238fd6 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/compiler/ReusableCompiler.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/compiler/ReusableCompiler.java @@ -18,7 +18,7 @@ // Forked from JavacTaskImpl package com.itsaky.lsp.java.compiler; -import com.itsaky.androidide.utils.Logger; +import com.itsaky.androidide.utils.ILogger; import com.itsaky.lsp.java.utils.TestUtils; import com.sun.source.tree.Tree; import com.sun.source.util.JavacTask; @@ -94,7 +94,7 @@ import javax.tools.JavaFileObject; */ public class ReusableCompiler { - private static final Logger LOG = Logger.newInstance("ReusableCompiler"); + private static final ILogger LOG = ILogger.newInstance("ReusableCompiler"); private static final JavacTool systemProvider = JavacTool.create(); private final List currentOptions = new ArrayList<>(); diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/compiler/SynchronizedTask.java b/lsp/java/src/main/java/com/itsaky/lsp/java/compiler/SynchronizedTask.java index 58225dd22..e15cc4ddf 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/compiler/SynchronizedTask.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/compiler/SynchronizedTask.java @@ -36,7 +36,7 @@ package com.itsaky.lsp.java.compiler; import androidx.annotation.NonNull; -import com.itsaky.androidide.utils.Logger; +import com.itsaky.androidide.utils.ILogger; import java.util.concurrent.Semaphore; import java.util.function.Consumer; @@ -45,7 +45,7 @@ import kotlin.jvm.functions.Function1; public class SynchronizedTask { - private static final Logger LOG = Logger.newInstance("SynchronizedTask"); + private static final ILogger LOG = ILogger.newInstance("SynchronizedTask"); private final Semaphore semaphore = new Semaphore(1); private volatile boolean isWriting; private CompileTask task; diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/parser/Parser.java b/lsp/java/src/main/java/com/itsaky/lsp/java/parser/Parser.java index 92d482ebe..29c639ce4 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/parser/Parser.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/parser/Parser.java @@ -17,7 +17,7 @@ package com.itsaky.lsp.java.parser; -import com.itsaky.androidide.utils.Logger; +import com.itsaky.androidide.utils.ILogger; import com.itsaky.lsp.java.FileStore; import com.itsaky.lsp.java.compiler.SourceFileManager; import com.itsaky.lsp.java.compiler.SourceFileObject; @@ -486,5 +486,5 @@ public class Parser { return ""; } - private static final Logger LOG = Logger.newInstance("JavaParser"); + private static final ILogger LOG = ILogger.newInstance("JavaParser"); } diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/providers/CodeFormatProvider.java b/lsp/java/src/main/java/com/itsaky/lsp/java/providers/CodeFormatProvider.java index 0140d1fbe..70d998ee7 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/providers/CodeFormatProvider.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/providers/CodeFormatProvider.java @@ -23,7 +23,7 @@ import com.google.common.io.CharSink; import com.google.common.io.CharSource; import com.google.googlejavaformat.java.Formatter; import com.google.googlejavaformat.java.JavaFormatterOptions; -import com.itsaky.androidide.utils.Logger; +import com.itsaky.androidide.utils.ILogger; import com.itsaky.lsp.api.IServerSettings; import com.itsaky.lsp.java.models.JavaServerSettings; @@ -37,7 +37,7 @@ import java.io.Writer; */ public class CodeFormatProvider { - private static final Logger LOG = Logger.newInstance("JavaCodeFormatProvider"); + private static final ILogger LOG = ILogger.newInstance("JavaCodeFormatProvider"); private final JavaServerSettings settings; diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/providers/CompletionProvider.java b/lsp/java/src/main/java/com/itsaky/lsp/java/providers/CompletionProvider.java index bf6e28deb..74417b1c6 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/providers/CompletionProvider.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/providers/CompletionProvider.java @@ -24,7 +24,7 @@ import static com.itsaky.lsp.java.utils.JavaPoetUtils.buildMethod; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.itsaky.androidide.utils.Logger; +import com.itsaky.androidide.utils.ILogger; import com.itsaky.lsp.api.AbstractServiceProvider; import com.itsaky.lsp.api.ICompletionProvider; import com.itsaky.lsp.api.IServerSettings; @@ -153,7 +153,7 @@ public class CompletionProvider extends AbstractServiceProvider implements IComp "float", "double", }; - private static final Logger LOG = Logger.newInstance("JavaCompletionProvider"); + private static final ILogger LOG = ILogger.newInstance("JavaCompletionProvider"); private final CompilerProvider compiler; private Path completingFile; private long cursor; diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/providers/DefinitionProvider.java b/lsp/java/src/main/java/com/itsaky/lsp/java/providers/DefinitionProvider.java index d25e6da95..4179c138f 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/providers/DefinitionProvider.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/providers/DefinitionProvider.java @@ -19,7 +19,7 @@ package com.itsaky.lsp.java.providers; import androidx.annotation.NonNull; -import com.itsaky.androidide.utils.Logger; +import com.itsaky.androidide.utils.ILogger; import com.itsaky.lsp.java.compiler.CompileTask; import com.itsaky.lsp.java.compiler.CompilerProvider; import com.itsaky.lsp.java.compiler.SourceFileObject; @@ -50,7 +50,7 @@ import javax.tools.JavaFileObject; public class DefinitionProvider { public static final List NOT_SUPPORTED = Collections.emptyList(); - private static final Logger LOG = Logger.newInstance("JavaDefinitionProvider"); + private static final ILogger LOG = ILogger.newInstance("JavaDefinitionProvider"); private final CompilerProvider compiler; private Path file; private int line, column; diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/providers/JavaSelectionProvider.java b/lsp/java/src/main/java/com/itsaky/lsp/java/providers/JavaSelectionProvider.java index 0a3828ea7..5e6d7a033 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/providers/JavaSelectionProvider.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/providers/JavaSelectionProvider.java @@ -19,7 +19,7 @@ package com.itsaky.lsp.java.providers; import androidx.annotation.NonNull; -import com.itsaky.androidide.utils.Logger; +import com.itsaky.androidide.utils.ILogger; import com.itsaky.lsp.java.compiler.CompilerProvider; import com.itsaky.lsp.java.visitors.FindBiggerRange; import com.itsaky.lsp.models.ExpandSelectionParams; @@ -33,7 +33,7 @@ import com.sun.source.tree.CompilationUnitTree; */ public class JavaSelectionProvider { - private static final Logger LOG = Logger.newInstance("JavaSelectionProvider"); + private static final ILogger LOG = ILogger.newInstance("JavaSelectionProvider"); private final CompilerProvider compiler; public JavaSelectionProvider(CompilerProvider compiler) { diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/rewrite/CreateMissingMethod.java b/lsp/java/src/main/java/com/itsaky/lsp/java/rewrite/CreateMissingMethod.java index 5bdb8a242..9394b57f3 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/rewrite/CreateMissingMethod.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/rewrite/CreateMissingMethod.java @@ -19,7 +19,7 @@ package com.itsaky.lsp.java.rewrite; import androidx.annotation.NonNull; -import com.itsaky.androidide.utils.Logger; +import com.itsaky.androidide.utils.ILogger; import com.itsaky.lsp.java.compiler.CompileTask; import com.itsaky.lsp.java.compiler.CompilerProvider; import com.itsaky.lsp.java.compiler.SynchronizedTask; @@ -52,7 +52,7 @@ import javax.lang.model.type.DeclaredType; import javax.lang.model.type.TypeMirror; public class CreateMissingMethod extends Rewrite { - private static final Logger LOG = Logger.newInstance("main"); + private static final ILogger LOG = ILogger.newInstance("main"); final Path file; final int position; int argCount = -1; diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/rewrite/GenerateRecordConstructor.java b/lsp/java/src/main/java/com/itsaky/lsp/java/rewrite/GenerateRecordConstructor.java index 2b992d80f..d22e6bd6f 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/rewrite/GenerateRecordConstructor.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/rewrite/GenerateRecordConstructor.java @@ -19,7 +19,7 @@ package com.itsaky.lsp.java.rewrite; import androidx.annotation.NonNull; -import com.itsaky.androidide.utils.Logger; +import com.itsaky.androidide.utils.ILogger; import com.itsaky.lsp.java.compiler.CompileTask; import com.itsaky.lsp.java.compiler.CompilerProvider; import com.itsaky.lsp.java.compiler.SynchronizedTask; @@ -48,7 +48,7 @@ import javax.lang.model.element.TypeElement; public class GenerateRecordConstructor extends Rewrite { - private static final Logger LOG = Logger.newInstance("main"); + private static final ILogger LOG = ILogger.newInstance("main"); final String className; public GenerateRecordConstructor(String className) { diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/rewrite/ImplementAbstractMethods.java b/lsp/java/src/main/java/com/itsaky/lsp/java/rewrite/ImplementAbstractMethods.java index 3101b0e5d..cb683d69e 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/rewrite/ImplementAbstractMethods.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/rewrite/ImplementAbstractMethods.java @@ -19,7 +19,7 @@ package com.itsaky.lsp.java.rewrite; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.itsaky.androidide.utils.Logger; +import com.itsaky.androidide.utils.ILogger; import com.itsaky.lsp.java.compiler.CompileTask; import com.itsaky.lsp.java.compiler.CompilerProvider; import com.itsaky.lsp.java.compiler.SynchronizedTask; @@ -59,7 +59,7 @@ import javax.lang.model.util.Elements; public class ImplementAbstractMethods extends Rewrite { - private static final Logger LOG = Logger.newInstance("main"); + private static final ILogger LOG = ILogger.newInstance("main"); private final String className; private final String classFile; private final long position; diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/utils/CodeActionUtils.java b/lsp/java/src/main/java/com/itsaky/lsp/java/utils/CodeActionUtils.java index 5c291ec64..5206baa32 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/utils/CodeActionUtils.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/utils/CodeActionUtils.java @@ -17,12 +17,12 @@ package com.itsaky.lsp.java.utils; -import static com.itsaky.androidide.utils.Logger.newInstance; +import static com.itsaky.androidide.utils.ILogger.newInstance; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.itsaky.androidide.utils.Logger; +import com.itsaky.androidide.utils.ILogger; import com.itsaky.lsp.java.compiler.CompileTask; import com.itsaky.lsp.java.compiler.CompilerProvider; import com.itsaky.lsp.java.rewrite.Rewrite; @@ -60,7 +60,7 @@ public class CodeActionUtils { Pattern.compile("^'((\\w+\\.)*\\w+)' is not thrown"); private static final Pattern UNREPORTED_EXCEPTION = Pattern.compile("unreported exception ((\\w+\\.)*\\w+)"); - private static final Logger LOG = newInstance("JavaCodeActionUtils"); + private static final ILogger LOG = newInstance("JavaCodeActionUtils"); public static CodeActionItem createQuickFix( final CompilerProvider compiler, String title, Rewrite rewrite) { diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/utils/JavaParserUtils.kt b/lsp/java/src/main/java/com/itsaky/lsp/java/utils/JavaParserUtils.kt index d0ecc64b4..d8316a4df 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/utils/JavaParserUtils.kt +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/utils/JavaParserUtils.kt @@ -77,7 +77,7 @@ import com.github.javaparser.ast.type.TypeParameter import com.github.javaparser.printer.DefaultPrettyPrinter import com.github.javaparser.printer.configuration.DefaultPrinterConfiguration import com.github.javaparser.printer.configuration.PrinterConfiguration -import com.itsaky.androidide.utils.Logger +import com.itsaky.androidide.utils.ILogger import com.itsaky.lsp.java.utils.TypeUtils.toType import com.itsaky.lsp.java.visitors.PrettyPrintingVisitor import com.sun.source.tree.AnnotationTree @@ -115,7 +115,7 @@ import org.jetbrains.annotations.Contract object JavaParserUtils { - private val log = Logger.newInstance(javaClass.simpleName) + private val log = ILogger.newInstance(javaClass.simpleName) /** * Collects all the type names from the given node. diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/utils/ScanClassPath.java b/lsp/java/src/main/java/com/itsaky/lsp/java/utils/ScanClassPath.java index ab17e8ae7..7efacd683 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/utils/ScanClassPath.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/utils/ScanClassPath.java @@ -21,7 +21,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import com.google.common.reflect.ClassPath; -import com.itsaky.androidide.utils.Logger; +import com.itsaky.androidide.utils.ILogger; import org.jetbrains.annotations.Contract; @@ -47,7 +47,7 @@ import java.util.stream.Stream; public class ScanClassPath { - private static final Logger LOG = Logger.newInstance("ScanClassPath"); + private static final ILogger LOG = ILogger.newInstance("ScanClassPath"); public Set jdkTopLevelClasses() { LOG.info("Searching for top-level classes in the JDK"); diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/utils/StringSearch.java b/lsp/java/src/main/java/com/itsaky/lsp/java/utils/StringSearch.java index 6e374cf5d..2bd67b056 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/utils/StringSearch.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/utils/StringSearch.java @@ -18,7 +18,7 @@ package com.itsaky.lsp.java.utils; import com.itsaky.androidide.utils.CharSequenceReader; -import com.itsaky.androidide.utils.Logger; +import com.itsaky.androidide.utils.ILogger; import com.itsaky.lsp.java.FileStore; import com.itsaky.lsp.util.StringUtils; @@ -522,5 +522,5 @@ public class StringSearch { private static final ThreadLocal SKIP_CHAR_BUFFER = ThreadLocal.withInitial(StringSearch::charArray); - private static final Logger LOG = Logger.newInstance("StringSearch"); + private static final ILogger LOG = ILogger.newInstance("StringSearch"); } diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/visitors/DiagnosticVisitor.kt b/lsp/java/src/main/java/com/itsaky/lsp/java/visitors/DiagnosticVisitor.kt index adb58d52e..0689980d5 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/visitors/DiagnosticVisitor.kt +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/visitors/DiagnosticVisitor.kt @@ -16,7 +16,7 @@ */ package com.itsaky.lsp.java.visitors -import com.itsaky.androidide.utils.Logger +import com.itsaky.androidide.utils.ILogger import com.sun.source.tree.BlockTree import com.sun.source.tree.ClassTree import com.sun.source.tree.CompilationUnitTree @@ -49,7 +49,7 @@ import javax.lang.model.type.TypeMirror class DiagnosticVisitor(task: JavacTaskImpl?) : TreeScanner>() { - private val log = Logger.newInstance(javaClass.simpleName) + private val log = ILogger.newInstance(javaClass.simpleName) private val trees = Trees.instance(task) private val privateDeclarations = mutableMapOf() private val localVariables = mutableMapOf() diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/visitors/FindBiggerRange.java b/lsp/java/src/main/java/com/itsaky/lsp/java/visitors/FindBiggerRange.java index 0b7e55ef5..ab420a1fe 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/visitors/FindBiggerRange.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/visitors/FindBiggerRange.java @@ -20,7 +20,7 @@ package com.itsaky.lsp.java.visitors; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.itsaky.androidide.utils.Logger; +import com.itsaky.androidide.utils.ILogger; import com.itsaky.lsp.models.Position; import com.itsaky.lsp.models.Range; import com.sun.source.tree.CompilationUnitTree; @@ -57,7 +57,7 @@ public class FindBiggerRange extends TreeScanner { final Range treeRange = getRange(tree); if (treeRange != null && range.isSmallerThan(treeRange)) { - Logger.newInstance("FindBiggerRange") + ILogger.newInstance("FindBiggerRange") .debug("Selecting tree", tree, tree.getClass(), tree.getKind()); return treeRange; } diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/visitors/FindCompletionsAt.java b/lsp/java/src/main/java/com/itsaky/lsp/java/visitors/FindCompletionsAt.java index b655af88c..38648bac5 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/visitors/FindCompletionsAt.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/visitors/FindCompletionsAt.java @@ -17,7 +17,7 @@ package com.itsaky.lsp.java.visitors; -import com.itsaky.androidide.utils.Logger; +import com.itsaky.androidide.utils.ILogger; import com.sun.source.tree.CaseTree; import com.sun.source.tree.CompilationUnitTree; import com.sun.source.tree.ErroneousTree; @@ -139,5 +139,5 @@ public class FindCompletionsAt extends TreePathScanner { return b; } - private static final Logger LOG = Logger.newInstance("FindCompletionsAt"); + private static final ILogger LOG = ILogger.newInstance("FindCompletionsAt"); } diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/visitors/FindMethodCallAt.java b/lsp/java/src/main/java/com/itsaky/lsp/java/visitors/FindMethodCallAt.java index 8e5f5c0c6..b78b19758 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/visitors/FindMethodCallAt.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/visitors/FindMethodCallAt.java @@ -17,7 +17,7 @@ package com.itsaky.lsp.java.visitors; -import com.itsaky.androidide.utils.Logger; +import com.itsaky.androidide.utils.ILogger; import com.sun.source.tree.AssignmentTree; import com.sun.source.tree.ClassTree; import com.sun.source.tree.CompilationUnitTree; @@ -260,5 +260,5 @@ public class FindMethodCallAt extends TreePathScanner) : Logger.LogListener { +class ReflectiveLogListener(private val receiver: Class) : ILogger.LogListener { override fun log(priority: Int, tag: String, message: String) { val method = receiver.getDeclaredMethod("log", Int::class.java, String::class.java, String::class.java) method.isAccessible = true diff --git a/lsp/xml/src/main/java/com/itsaky/lsp/xml/providers/CompletionProvider.java b/lsp/xml/src/main/java/com/itsaky/lsp/xml/providers/CompletionProvider.java index 592db180b..df8cf4b8a 100644 --- a/lsp/xml/src/main/java/com/itsaky/lsp/xml/providers/CompletionProvider.java +++ b/lsp/xml/src/main/java/com/itsaky/lsp/xml/providers/CompletionProvider.java @@ -23,7 +23,7 @@ import androidx.annotation.Nullable; import com.itsaky.androidide.app.BaseApplication; import com.itsaky.androidide.lexers.xml.XMLLexer; import com.itsaky.androidide.utils.CharSequenceReader; -import com.itsaky.androidide.utils.Logger; +import com.itsaky.androidide.utils.ILogger; import com.itsaky.attrinfo.models.Attr; import com.itsaky.lsp.api.AbstractServiceProvider; import com.itsaky.lsp.api.ICompletionProvider; @@ -59,7 +59,7 @@ import io.github.rosemoe.sora.lang.completion.CompletionCancelledException; */ public class CompletionProvider extends AbstractServiceProvider implements ICompletionProvider { - private static final Logger LOG = Logger.newInstance("XMLCompletionProvider"); + private static final ILogger LOG = ILogger.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"; diff --git a/lsp/xml/src/main/java/com/itsaky/lsp/xml/utils/XmlUtils.java b/lsp/xml/src/main/java/com/itsaky/lsp/xml/utils/XmlUtils.java index 155f8c434..900b92756 100644 --- a/lsp/xml/src/main/java/com/itsaky/lsp/xml/utils/XmlUtils.java +++ b/lsp/xml/src/main/java/com/itsaky/lsp/xml/utils/XmlUtils.java @@ -20,7 +20,7 @@ package com.itsaky.lsp.xml.utils; import androidx.annotation.NonNull; import com.itsaky.androidide.utils.CharSequenceReader; -import com.itsaky.androidide.utils.Logger; +import com.itsaky.androidide.utils.ILogger; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; @@ -32,7 +32,7 @@ import org.xmlpull.v1.XmlPullParserFactory; public class XmlUtils { private static final XmlPullParserFactory parserFactory; - private static final Logger LOG = Logger.newInstance("XmlUtils"); + private static final ILogger LOG = ILogger.newInstance("XmlUtils"); static { try { diff --git a/sdk-info/src/main/java/com/itsaky/attrinfo/models/Attr.java b/sdk-info/src/main/java/com/itsaky/attrinfo/models/Attr.java index 913277049..65dfb2af0 100755 --- a/sdk-info/src/main/java/com/itsaky/attrinfo/models/Attr.java +++ b/sdk-info/src/main/java/com/itsaky/attrinfo/models/Attr.java @@ -23,7 +23,7 @@ import android.text.TextUtils; import androidx.annotation.NonNull; -import com.itsaky.androidide.utils.Logger; +import com.itsaky.androidide.utils.ILogger; import com.itsaky.xml.INamespace; import org.jetbrains.annotations.Contract; @@ -76,7 +76,7 @@ public class Attr implements Parcelable { return new Attr[size]; } }; - private static final Logger LOG = Logger.newInstance("AttrInfo::Attr"); + private static final ILogger LOG = ILogger.newInstance("AttrInfo::Attr"); public INamespace namespace; public String name; public Set possibleValues; diff --git a/xml-inflater/src/main/java/com/itsaky/inflater/XMLLayoutInflater.java b/xml-inflater/src/main/java/com/itsaky/inflater/XMLLayoutInflater.java index 0bc8fa438..1a829631b 100644 --- a/xml-inflater/src/main/java/com/itsaky/inflater/XMLLayoutInflater.java +++ b/xml-inflater/src/main/java/com/itsaky/inflater/XMLLayoutInflater.java @@ -33,7 +33,7 @@ import androidx.annotation.StringRes; import com.blankj.utilcode.util.ReflectUtils; import com.itsaky.androidide.app.BaseApplication; -import com.itsaky.androidide.utils.Logger; +import com.itsaky.androidide.utils.ILogger; import com.itsaky.attrinfo.AttrInfo; import com.itsaky.inflater.adapters.android.view.ViewAttrAdapter; import com.itsaky.inflater.adapters.android.view.ViewGroupAttrAdapter; @@ -72,7 +72,7 @@ class XMLLayoutInflater extends BaseLayoutInflater { private ContextProvider contextProvider; - private static final Logger LOG = Logger.newInstance("XMLLayoutInflater"); + private static final ILogger LOG = ILogger.newInstance("XMLLayoutInflater"); public static final String ATTR_ADAPTER_SUFFIX = "AttrAdapter"; XMLLayoutInflater(@NonNull LayoutInflaterConfiguration config) { diff --git a/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/view/ViewAttrAdapter.java b/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/view/ViewAttrAdapter.java index d963cc1f0..51d5173b8 100644 --- a/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/view/ViewAttrAdapter.java +++ b/xml-inflater/src/main/java/com/itsaky/inflater/adapters/android/view/ViewAttrAdapter.java @@ -31,7 +31,7 @@ import android.widget.RelativeLayout; import androidx.annotation.ChecksSdkIntAtLeast; import androidx.annotation.NonNull; -import com.itsaky.androidide.utils.Logger; +import com.itsaky.androidide.utils.ILogger; import com.itsaky.inflater.IAttribute; import com.itsaky.inflater.IAttributeAdapter; import com.itsaky.inflater.IDTable; @@ -47,7 +47,7 @@ import com.itsaky.xml.INamespace; */ public class ViewAttrAdapter extends CommonParseUtils implements IAttributeAdapter { - protected static final Logger LOG = Logger.newInstance("BaseViewAttrAdapter"); + protected static final ILogger LOG = ILogger.newInstance("BaseViewAttrAdapter"); public ViewAttrAdapter(@NonNull IResourceTable resourceFinder, DisplayMetrics displayMetrics) { super(resourceFinder, displayMetrics); diff --git a/xml-inflater/src/main/java/com/itsaky/inflater/drawable/DrawableParserFactory.java b/xml-inflater/src/main/java/com/itsaky/inflater/drawable/DrawableParserFactory.java index a7c6fcd25..75293a2e4 100644 --- a/xml-inflater/src/main/java/com/itsaky/inflater/drawable/DrawableParserFactory.java +++ b/xml-inflater/src/main/java/com/itsaky/inflater/drawable/DrawableParserFactory.java @@ -29,7 +29,7 @@ import androidx.annotation.Nullable; import com.blankj.utilcode.util.FileIOUtils; import com.blankj.utilcode.util.ImageUtils; -import com.itsaky.androidide.utils.Logger; +import com.itsaky.androidide.utils.ILogger; import com.itsaky.inflater.IResourceTable; import com.sdsmdg.harjot.vectormaster.VectorMasterDrawable; @@ -49,7 +49,7 @@ import java.io.StringReader; */ public abstract class DrawableParserFactory { - private static final Logger LOG = Logger.newInstance("IDrawableParser"); + private static final ILogger LOG = ILogger.newInstance("IDrawableParser"); /** * Create a new drawable parser for the given file. If the given file is not an XML Document, diff --git a/xml-inflater/src/main/java/com/itsaky/inflater/drawable/StateListParser.java b/xml-inflater/src/main/java/com/itsaky/inflater/drawable/StateListParser.java index 8f89112c6..71352d9a6 100644 --- a/xml-inflater/src/main/java/com/itsaky/inflater/drawable/StateListParser.java +++ b/xml-inflater/src/main/java/com/itsaky/inflater/drawable/StateListParser.java @@ -22,7 +22,7 @@ import android.graphics.drawable.StateListDrawable; import android.util.DisplayMetrics; import com.itsaky.androidide.app.BaseApplication; -import com.itsaky.androidide.utils.Logger; +import com.itsaky.androidide.utils.ILogger; import com.itsaky.inflater.IResourceTable; import com.itsaky.inflater.InflateException; @@ -37,7 +37,7 @@ import java.util.ArrayList; */ public class StateListParser extends IDrawableParser { - private static final Logger LOG = Logger.newInstance("StateListParser"); + private static final ILogger LOG = ILogger.newInstance("StateListParser"); protected StateListParser( XmlPullParser parser, diff --git a/xml-inflater/src/main/java/com/itsaky/inflater/impl/BaseView.java b/xml-inflater/src/main/java/com/itsaky/inflater/impl/BaseView.java index c6199e437..70749cf7f 100644 --- a/xml-inflater/src/main/java/com/itsaky/inflater/impl/BaseView.java +++ b/xml-inflater/src/main/java/com/itsaky/inflater/impl/BaseView.java @@ -22,7 +22,7 @@ import android.view.View; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.itsaky.androidide.utils.Logger; +import com.itsaky.androidide.utils.ILogger; import com.itsaky.inflater.IAttribute; import com.itsaky.inflater.IAttributeAdapter; import com.itsaky.inflater.IView; @@ -53,7 +53,7 @@ public abstract class BaseView implements IView { protected Object stored; private boolean isPlaceholder; - protected final Logger LOG = Logger.newInstance(getClass().getSimpleName()); + protected final ILogger LOG = ILogger.newInstance(getClass().getSimpleName()); public BaseView(String qualifiedName, View view) { this(qualifiedName, view, false); diff --git a/xml-inflater/src/main/java/com/itsaky/inflater/util/CommonParseUtils.java b/xml-inflater/src/main/java/com/itsaky/inflater/util/CommonParseUtils.java index 72e4ce669..9028f1a1b 100644 --- a/xml-inflater/src/main/java/com/itsaky/inflater/util/CommonParseUtils.java +++ b/xml-inflater/src/main/java/com/itsaky/inflater/util/CommonParseUtils.java @@ -32,7 +32,7 @@ import androidx.core.content.ContextCompat; import androidx.core.view.GravityCompat; import com.itsaky.androidide.app.BaseApplication; -import com.itsaky.androidide.utils.Logger; +import com.itsaky.androidide.utils.ILogger; import com.itsaky.inflater.IResourceTable; import com.itsaky.inflater.drawable.DrawableParserFactory; @@ -54,7 +54,7 @@ public class CommonParseUtils { protected IResourceTable resourceFinder; protected final DisplayMetrics displayMetrics; - private static final Logger LOG = Logger.newInstance("CommonParseUtils"); + private static final ILogger LOG = ILogger.newInstance("CommonParseUtils"); public CommonParseUtils(@NonNull IResourceTable resourceFinder, DisplayMetrics displayMetrics) { this.resourceFinder = resourceFinder; diff --git a/xml-inflater/src/main/java/com/itsaky/inflater/values/ValuesTable.java b/xml-inflater/src/main/java/com/itsaky/inflater/values/ValuesTable.java index 2d39f1ace..23dcf4552 100644 --- a/xml-inflater/src/main/java/com/itsaky/inflater/values/ValuesTable.java +++ b/xml-inflater/src/main/java/com/itsaky/inflater/values/ValuesTable.java @@ -21,7 +21,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import com.blankj.utilcode.util.FileUtils; -import com.itsaky.androidide.utils.Logger; +import com.itsaky.androidide.utils.ILogger; import com.itsaky.inflater.values.models.ArrayResource; import com.itsaky.inflater.values.models.BooleanResource; import com.itsaky.inflater.values.models.ColorResource; @@ -49,7 +49,7 @@ import java.util.Objects; */ public class ValuesTable { - private static final Logger LOG = Logger.newInstance("ValuesTable"); + private static final ILogger LOG = ILogger.newInstance("ValuesTable"); // TODO Parse styles and styleables private final Map arrays; private final Map strings; diff --git a/xml-inflater/src/main/java/com/itsaky/inflater/values/ValuesTableFactory.java b/xml-inflater/src/main/java/com/itsaky/inflater/values/ValuesTableFactory.java index 73355ceb7..3fc9d474b 100644 --- a/xml-inflater/src/main/java/com/itsaky/inflater/values/ValuesTableFactory.java +++ b/xml-inflater/src/main/java/com/itsaky/inflater/values/ValuesTableFactory.java @@ -16,7 +16,7 @@ */ package com.itsaky.inflater.values; -import com.itsaky.androidide.utils.Logger; +import com.itsaky.androidide.utils.ILogger; import java.io.File; import java.util.HashMap; @@ -33,7 +33,7 @@ import java.util.regex.Pattern; public class ValuesTableFactory { private static final Map valueTables = new HashMap<>(); - private static final Logger LOG = Logger.newInstance("ValuesTableFactory"); + private static final ILogger LOG = ILogger.newInstance("ValuesTableFactory"); public static ValuesTable getTable(final File resDir) { return valueTables.getOrDefault(resDir, null); diff --git a/xml-inflater/src/main/java/com/sdsmdg/harjot/vectormaster/utilities/legacyparser/PathParser.java b/xml-inflater/src/main/java/com/sdsmdg/harjot/vectormaster/utilities/legacyparser/PathParser.java index b3c3c5964..2e17abf26 100644 --- a/xml-inflater/src/main/java/com/sdsmdg/harjot/vectormaster/utilities/legacyparser/PathParser.java +++ b/xml-inflater/src/main/java/com/sdsmdg/harjot/vectormaster/utilities/legacyparser/PathParser.java @@ -20,14 +20,14 @@ import android.graphics.Path; import androidx.annotation.Nullable; -import com.itsaky.androidide.utils.Logger; +import com.itsaky.androidide.utils.ILogger; 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.newInstance("PathParser"); + private static final ILogger LOG = ILogger.newInstance("PathParser"); // Copy from Arrays.copyOfRange() which is only available from API level 9. /**