diff --git a/app/src/main/java/com/itsaky/androidide/DesignerActivity.java b/app/src/main/java/com/itsaky/androidide/DesignerActivity.java index e52d38bb8..2d7346c69 100755 --- a/app/src/main/java/com/itsaky/androidide/DesignerActivity.java +++ b/app/src/main/java/com/itsaky/androidide/DesignerActivity.java @@ -93,7 +93,7 @@ public class DesignerActivity extends StudioActivity public static final String KEY_GENERATED_CODE = "designer_xmlCode"; public static final String DRAGGING_WIDGET_TAG = "DRAGGING_WIDGET"; public static final String DRAGGING_WIDGET_MIME = "application/ide_widget"; - private static final Logger LOG = Logger.instance("DesignerActivity"); + private static final Logger LOG = Logger.newInstance ("DesignerActivity"); public final String EDITOR_SHEET_DIALOG_TAG = "attribute_editor_dialog"; private final boolean isTablet = DeviceUtils.isTablet(); private final List 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 b6f690426..3ba567acb 100755 --- a/app/src/main/java/com/itsaky/androidide/EditorActivity.java +++ b/app/src/main/java/com/itsaky/androidide/EditorActivity.java @@ -148,7 +148,7 @@ public class EditorActivity extends StudioActivity private static final int ACTION_ID_CLOSE = 100; private static final int ACTION_ID_OTHERS = 101; private static final int ACTION_ID_ALL = 102; - private static final Logger LOG = Logger.instance("EditorActivity"); + private static final Logger LOG = Logger.newInstance ("EditorActivity"); /** * MenuItem(s) that are related to the build process * diff --git a/app/src/main/java/com/itsaky/androidide/TerminalActivity.java b/app/src/main/java/com/itsaky/androidide/TerminalActivity.java index c9dec2d54..b4f09dd3f 100755 --- a/app/src/main/java/com/itsaky/androidide/TerminalActivity.java +++ b/app/src/main/java/com/itsaky/androidide/TerminalActivity.java @@ -62,7 +62,7 @@ import org.json.JSONException; public class TerminalActivity extends StudioActivity { public static final String KEY_WORKING_DIRECTORY = "terminal_workingDirectory"; - private static final Logger LOG = Logger.instance("TerminalActivity"); + private static final Logger LOG = Logger.newInstance ("TerminalActivity"); private static final byte[] SOURCES_LIST_CONTENT = "deb https://androidide.com/packages/ stable main".getBytes(); private final Client client = new Client(); 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 7192cde10..1e4e8d00d 100644 --- a/app/src/main/java/com/itsaky/androidide/adapters/AttrValueFormatTabAdapter.java +++ b/app/src/main/java/com/itsaky/androidide/adapters/AttrValueFormatTabAdapter.java @@ -38,7 +38,7 @@ import java.util.Objects; @SuppressWarnings("deprecation") public class AttrValueFormatTabAdapter extends FragmentStatePagerAdapter { - private static final Logger LOG = Logger.instance("AttrValueEditorTabAdapter"); + private static final Logger LOG = Logger.newInstance ("AttrValueEditorTabAdapter"); private final List 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 432cb421f..67511fe0b 100755 --- a/app/src/main/java/com/itsaky/androidide/adapters/CompletionListAdapter.java +++ b/app/src/main/java/com/itsaky/androidide/adapters/CompletionListAdapter.java @@ -49,7 +49,7 @@ import java.util.List; public class CompletionListAdapter extends EditorCompletionAdapter { - private static final Logger LOG = Logger.instance("CompletionListAdapter"); + private static final Logger LOG = Logger.newInstance ("CompletionListAdapter"); @Override public void attachValues( 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 edf7f5ab5..995890317 100644 --- a/app/src/main/java/com/itsaky/androidide/adapters/EditorBottomSheetTabAdapter.java +++ b/app/src/main/java/com/itsaky/androidide/adapters/EditorBottomSheetTabAdapter.java @@ -17,8 +17,6 @@ package com.itsaky.androidide.adapters; -import static com.itsaky.androidide.utils.Logger.instance; - import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.collection.LongSparseArray; @@ -37,7 +35,7 @@ import java.util.List; public class EditorBottomSheetTabAdapter extends FragmentStateAdapter { - private static final Logger LOG = instance("EditorBottomSheetTabAdapter"); + private static final Logger LOG = Logger.newInstance ("EditorBottomSheetTabAdapter"); private final List 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 a5d77f8af..c91ac6ec5 100755 --- a/app/src/main/java/com/itsaky/androidide/app/StudioActivity.java +++ b/app/src/main/java/com/itsaky/androidide/app/StudioActivity.java @@ -37,7 +37,7 @@ public abstract class StudioActivity extends AppCompatActivity { public static final String TAG = "StudioActivity"; public static final int REQCODE_STORAGE = 1009; - protected static Logger LOG = Logger.instance("StudioActivity"); + protected static Logger LOG = Logger.newInstance ("StudioActivity"); @Override protected void onCreate(Bundle savedInstanceState) { 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 17716fcfa..428787988 100755 --- a/app/src/main/java/com/itsaky/androidide/app/StudioApp.java +++ b/app/src/main/java/com/itsaky/androidide/app/StudioApp.java @@ -43,7 +43,7 @@ import java.util.concurrent.CompletionException; public class StudioApp extends BaseApplication { - private static final Logger LOG = Logger.instance("StudioApp"); + private static final Logger LOG = Logger.newInstance ("StudioApp"); private static StudioApp instance; private static SDKInfo sdkInfo; private final ILanguageServer mJavaLanguageServer = new JavaLanguageServer(); 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 0aa22804e..fd64b02c0 100644 --- a/app/src/main/java/com/itsaky/androidide/filepicker/IDEDocumentsProvider.java +++ b/app/src/main/java/com/itsaky/androidide/filepicker/IDEDocumentsProvider.java @@ -17,8 +17,6 @@ package com.itsaky.androidide.filepicker; -import static com.itsaky.androidide.utils.Logger.instance; - import android.content.res.AssetFileDescriptor; import android.database.Cursor; import android.database.MatrixCursor; @@ -56,7 +54,7 @@ import java.util.LinkedList; public class IDEDocumentsProvider extends DocumentsProvider { private static final String ALL_MIME_TYPES = "*/*"; - private static final Logger LOG = instance("IDEDocumentsProvider"); + private static final Logger LOG = Logger.newInstance ("IDEDocumentsProvider"); private static final File BASE_DIR = getBaseDir(); // The default columns to return information about a root if no specific // columns are requested in a query. 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 b01708922..ed321b735 100644 --- a/app/src/main/java/com/itsaky/androidide/fragments/NonEditableEditorFragment.java +++ b/app/src/main/java/com/itsaky/androidide/fragments/NonEditableEditorFragment.java @@ -17,8 +17,6 @@ package com.itsaky.androidide.fragments; -import static com.itsaky.androidide.utils.Logger.instance; - import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; @@ -35,7 +33,7 @@ import io.github.rosemoe.sora.lang.EmptyLanguage; public abstract class NonEditableEditorFragment extends Fragment { - private static final Logger LOG = instance("NonEditableEditorFragment"); + private static final Logger LOG = Logger.newInstance ("NonEditableEditorFragment"); private FragmentNonEditableEditorBinding binding; @Nullable 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 9b409da8a..7bd319a30 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 @@ -16,8 +16,6 @@ */ package com.itsaky.androidide.fragments.attr; -import static com.itsaky.androidide.utils.Logger.instance; - import android.text.Editable; import android.text.TextUtils; import android.widget.AutoCompleteTextView; @@ -37,7 +35,7 @@ import java.util.concurrent.CompletableFuture; */ public abstract class AbstractReferenceEditor extends BaseValueEditorFragment { - private static final Logger LOG = instance("ReferenceEditor"); + private static final Logger LOG = Logger.newInstance ("ReferenceEditor"); public TextWatcherAdapter resInputWatcher; @Override 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 15a5a46d8..993b60829 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 @@ -44,7 +44,7 @@ import java.util.stream.Collectors; */ public class DimensionEditor extends AbstractReferenceEditor { - private static final Logger LOG = Logger.instance("DimensionEditor"); + private static final Logger LOG = Logger.newInstance ("DimensionEditor"); public TextWatcherAdapter dimensionInputWatcher; private LayoutDimensionAttrEditorBinding binding; 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 4b8c740be..f3c9335dd 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 @@ -30,7 +30,7 @@ import com.itsaky.androidide.utils.Logger; */ public class EnumEditor extends FixedValueEditor { - private static final Logger LOG = Logger.instance("EnumEditor"); + private static final Logger LOG = Logger.newInstance ("EnumEditor"); @Override public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { 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 58be730a8..c4927ef7c 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 @@ -17,8 +17,6 @@ package com.itsaky.androidide.fragments.attr; -import static com.itsaky.androidide.utils.Logger.instance; - import android.os.Bundle; import android.text.TextUtils; import android.view.View; @@ -36,7 +34,7 @@ import java.util.Arrays; */ public class FlagEditor extends FixedValueEditor { - private static final Logger LOG = instance("FlagEditor"); + private static final Logger LOG = Logger.newInstance ("FlagEditor"); @Override public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { 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 db8146792..2722e5a70 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 @@ -17,8 +17,6 @@ */ package com.itsaky.androidide.fragments.preferences; -import static com.itsaky.androidide.utils.Logger.instance; - import android.content.Intent; import android.net.Uri; import android.os.Bundle; @@ -43,7 +41,7 @@ public class IDEPreferences extends BasePreferenceFragment public static final String KEY_ISSUES = "idepref_issues"; public static final String KEY_CHANGELOG = "idepref_changelog"; public static final String KEY_ABOUT = "idepref_about"; - private static final Logger LOG = instance("IDEPreferences"); + private static final Logger LOG = Logger.newInstance ("IDEPreferences"); private GeneralPreferences mGeneralPrefs; private BuildPreferences mBuildPreferences; private EditorPreferences mEditorPreferences; 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 c2e2d47c1..9a4a13138 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 @@ -59,7 +59,7 @@ public class AttrEditorSheet extends BottomSheetDialogFragment BaseValueEditorFragment.OnValueChangeListener { private static final List VIEW_ACTIONS = new ArrayList<>(); - private static final Logger LOG = Logger.instance("AttrBottomSheet"); + private static final Logger LOG = Logger.newInstance ("AttrBottomSheet"); private AttributeListSheet mAttrListSheet; private AttrValueEditorSheet mValueEditorSheet; private IView selectedView; 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 487cc323e..2a362bc8f 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 @@ -32,7 +32,7 @@ import com.itsaky.androidide.utils.Logger; public class ProgressSheet extends BaseBottomSheetFragment { - private final Logger LOG = Logger.instance("ProgressSheet"); + private final Logger LOG = Logger.newInstance ("ProgressSheet"); private LayoutProgressSheetBinding binding; private String message = ""; private String subMessage = ""; 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 97c8c5ef1..7b6b69126 100644 --- a/app/src/main/java/com/itsaky/androidide/language/CommonCompletionProvider.java +++ b/app/src/main/java/com/itsaky/androidide/language/CommonCompletionProvider.java @@ -62,7 +62,7 @@ public class CommonCompletionProvider { String s2 = p2.getSortText() == null ? p2.getLabel() : p2.getSortText(); return s1.compareTo(s2); }; - private static final Logger LOG = Logger.instance("CommonCompletionProvider"); + private static final Logger LOG = Logger.newInstance ("CommonCompletionProvider"); private final ILanguageServer server; private CompletableFuture 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 eb2f5fc1f..00f32429b 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 @@ -43,7 +43,7 @@ import org.antlr.v4.runtime.Token; public class GroovyAnalyzer extends SimpleAnalyzeManager { - private static final Logger LOG = Logger.instance("GroovyAnalyzer"); + private static final Logger LOG = Logger.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 accab28e9..6296c58d4 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 @@ -38,7 +38,7 @@ import org.antlr.v4.runtime.Token; public class GroovyLanguage extends IDELanguage { - private static final Logger LOG = Logger.instance("GroovyLanguage"); + private static final Logger LOG = Logger.newInstance ("GroovyLanguage"); private final GroovyAnalyzer analyzer; private final GroovyAutoComplete completer; private final NewlineHandler[] newlineHandlers = new NewlineHandler[] {new BraceHandler()}; 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 10ce197e1..d30266487 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 @@ -58,7 +58,7 @@ import org.jetbrains.annotations.Contract; */ public class JavaAnalyzer extends SimpleAnalyzeManager implements IAnalyzeManager { - private static final Logger LOG = Logger.instance("JavaAnalyzer"); + private static final Logger LOG = Logger.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 ba5bd0856..b3ba0980c 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 @@ -47,7 +47,7 @@ import org.antlr.v4.runtime.Token; public class JavaLanguage extends IDELanguage { - private static final Logger LOG = Logger.instance("JavaLanguage"); + private static final Logger LOG = Logger.newInstance ("JavaLanguage"); private final NewlineHandler[] newlineHandlers; private JavaAnalyzer analyzer; private CommonCompletionProvider completer; 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 6baf9721e..fc7000472 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 @@ -44,7 +44,7 @@ import org.antlr.v4.runtime.Token; */ public class XMLAnalyzer extends SimpleAnalyzeManager { - private static final Logger LOG = Logger.instance("XMLAnalyzer"); + private static final Logger LOG = Logger.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 6a86fb8f4..aa8d4d1d3 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 @@ -42,7 +42,7 @@ import org.antlr.v4.runtime.Token; public class XMLLanguage extends IDELanguage { - private static final Logger LOG = Logger.instance("XMLLanguage"); + private static final Logger LOG = Logger.newInstance ("XMLLanguage"); private final CommonCompletionProvider completer; private final NewlineHandler[] newlineHandlers; private XMLAnalyzer analyzer; 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 0e7c431d6..89a925150 100755 --- a/app/src/main/java/com/itsaky/androidide/lsp/IDELanguageClientImpl.java +++ b/app/src/main/java/com/itsaky/androidide/lsp/IDELanguageClientImpl.java @@ -61,7 +61,7 @@ import java.util.Objects; public class IDELanguageClientImpl implements ILanguageClient { protected static final Gson gson = new Gson(); - protected static final Logger LOG = Logger.instance("AbstractLanguageClient"); + protected static final Logger LOG = Logger.newInstance ("AbstractLanguageClient"); private static IDELanguageClientImpl mInstance; private final Map> 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 58ea23a30..2f04c7a5a 100644 --- a/app/src/main/java/com/itsaky/androidide/project/ProjectResourceTable.java +++ b/app/src/main/java/com/itsaky/androidide/project/ProjectResourceTable.java @@ -30,7 +30,7 @@ import java.util.Locale; public class ProjectResourceTable implements IResourceTable { - private static final Logger LOG = Logger.instance("ProjectResourceFinder"); + private static final Logger LOG = Logger.newInstance ("ProjectResourceFinder"); private File resDir; private File color; private File layout; 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 1830968bd..0aa35d240 100755 --- a/app/src/main/java/com/itsaky/androidide/services/LogReceiver.java +++ b/app/src/main/java/com/itsaky/androidide/services/LogReceiver.java @@ -33,7 +33,7 @@ public class LogReceiver extends BroadcastReceiver { public static final String APPEND_LOG = "com.itsaky.androidide.logs.APPEND_LOG"; public static final String EXTRA_LINE = "log_line"; - private final Logger LOG = Logger.instance("LogReceiver"); + private final Logger LOG = Logger.newInstance ("LogReceiver"); public LogReceiver setLogListener(LogListener listener) { this.listener = listener; 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 cdd06df30..22401c176 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 @@ -85,7 +85,7 @@ public class IDEService { public static final int TASK_LINT_DEBUG = GradleTask.TASK_LINT_DEBUG; public static final int TASK_LINT_RELEASE = GradleTask.TASK_LINT_RELEASE; - public static final Logger LOG = Logger.instance("IDEService"); + public static final Logger LOG = Logger.newInstance ("IDEService"); private final InputStreamLineReader.OnReadListener mOutputReadListener = this::onBuildOutput; 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 312a7dcf5..a65b35197 100755 --- a/app/src/main/java/com/itsaky/androidide/tasks/TaskExecutor.java +++ b/app/src/main/java/com/itsaky/androidide/tasks/TaskExecutor.java @@ -26,7 +26,7 @@ import java.util.concurrent.CompletionException; public class TaskExecutor { - private final Logger LOG = Logger.instance("TaskExecutor"); + private final Logger LOG = Logger.newInstance ("TaskExecutor"); public void executeAsync(Callable callable, Callback callback) { CompletableFuture.supplyAsync( 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 26d59d07e..1f4254bcf 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 @@ -141,5 +141,5 @@ public abstract class ApkGeneratingTask extends BaseGradleTask { return false; } - private static final Logger LOG = Logger.instance("ApkGeneratingTask"); + private static final Logger LOG = Logger.newInstance ("ApkGeneratingTask"); } 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 e0f705fa7..ff1db533b 100755 --- a/app/src/main/java/com/itsaky/androidide/ui/WidgetDragListener.java +++ b/app/src/main/java/com/itsaky/androidide/ui/WidgetDragListener.java @@ -54,7 +54,7 @@ public class WidgetDragListener implements View.OnDragListener { public static final String ANDROID_NS = "android"; - private static final Logger LOG = Logger.instance("WidgetDragListener"); + private static final Logger LOG = Logger.newInstance ("WidgetDragListener"); public WidgetDragListener( @NonNull Context context, IViewGroup viewGroup, OnViewAddedListener addedListener) { 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 aa0b531e2..6ce522922 100644 --- a/app/src/main/java/com/itsaky/androidide/utils/EditorBottomSheetBehavior.java +++ b/app/src/main/java/com/itsaky/androidide/utils/EditorBottomSheetBehavior.java @@ -30,7 +30,7 @@ import com.itsaky.androidide.databinding.LayoutEditorBottomSheetBinding; public class EditorBottomSheetBehavior extends BottomSheetBehavior { private LayoutEditorBottomSheetBinding binding; - private static final Logger LOG = Logger.instance("EditorBottomSheetBehavior"); + private static final Logger LOG = Logger.newInstance ("EditorBottomSheetBehavior"); public EditorBottomSheetBehavior(Context context, AttributeSet attributeSet) { super(context, attributeSet); 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 6e7d6895a..4f5597ce7 100644 --- a/app/src/main/java/com/itsaky/androidide/utils/HighlightRangeHelper.java +++ b/app/src/main/java/com/itsaky/androidide/utils/HighlightRangeHelper.java @@ -134,5 +134,5 @@ public class HighlightRangeHelper { return false; } - private static final Logger LOG = Logger.instance("HighlightRangeHelper"); + private static final Logger LOG = Logger.newInstance ("HighlightRangeHelper"); } 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 f5f2e0e03..9b66ddddb 100755 --- a/app/src/main/java/com/itsaky/androidide/utils/RecursiveFileSearcher.java +++ b/app/src/main/java/com/itsaky/androidide/utils/RecursiveFileSearcher.java @@ -44,7 +44,7 @@ import java.util.regex.Pattern; */ public class RecursiveFileSearcher { - private static final Logger logger = Logger.instance("RecursiveFileSearcher"); + private static final Logger logger = Logger.newInstance ("RecursiveFileSearcher"); /** * Search the given text in files recursively in given search directories 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 3e44cac7b..b0c08d6d3 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 @@ -78,7 +78,7 @@ import org.antlr.v4.runtime.Token; @SuppressLint("ViewConstructor") // This view is always dynamically created. public class CodeEditorView extends FrameLayout { - private static final Logger LOG = Logger.instance("CodeEditorView"); + private static final Logger LOG = Logger.newInstance ("CodeEditorView"); private final File file; private final LayoutCodeEditorBinding binding; private boolean isModified; diff --git a/app/src/main/java/com/itsaky/androidide/views/editor/EditorTextActionMode.java b/app/src/main/java/com/itsaky/androidide/views/editor/EditorTextActionMode.java index ebf908537..c3e8c4600 100644 --- a/app/src/main/java/com/itsaky/androidide/views/editor/EditorTextActionMode.java +++ b/app/src/main/java/com/itsaky/androidide/views/editor/EditorTextActionMode.java @@ -40,7 +40,7 @@ import java.util.stream.Collectors; */ public class EditorTextActionMode implements IDEEditor.ITextActionPresenter { - private static final Logger LOG = Logger.instance("EditorTextActionMode"); + private static final Logger LOG = Logger.newInstance ("EditorTextActionMode"); private final Set registeredActions = new TreeSet<>(); private IDEEditor editor; private ActionMode actionMode; diff --git a/app/src/main/java/com/itsaky/androidide/views/editor/EditorTextActionWindow.java b/app/src/main/java/com/itsaky/androidide/views/editor/EditorTextActionWindow.java index 7d4c62480..8413a043f 100644 --- a/app/src/main/java/com/itsaky/androidide/views/editor/EditorTextActionWindow.java +++ b/app/src/main/java/com/itsaky/androidide/views/editor/EditorTextActionWindow.java @@ -16,8 +16,6 @@ */ package com.itsaky.androidide.views.editor; -import static com.itsaky.androidide.utils.Logger.instance; - import android.graphics.RectF; import android.graphics.drawable.Drawable; import android.graphics.drawable.GradientDrawable; @@ -56,7 +54,7 @@ import java.util.stream.Collectors; public class EditorTextActionWindow extends EditorPopupWindow implements IDEEditor.ITextActionPresenter { - private static final Logger LOG = instance("EditorTextActionWindow"); + private static final Logger LOG = Logger.newInstance ("EditorTextActionWindow"); private static final long DELAY = 200; protected final List> subscriptionReceipts; 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 234f6b7fe..cdbf43b6f 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 @@ -73,7 +73,7 @@ import org.jetbrains.annotations.Contract; public class IDEEditor extends CodeEditor { public static final String KEY_FILE = "editor_file"; - private static final Logger LOG = Logger.instance("IDEEditor"); + private static final Logger LOG = Logger.newInstance ("IDEEditor"); private int mFileVersion; private File file; private ILanguageServer mLanguageServer; 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 ae87f93fd..4f086142a 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 @@ -35,7 +35,7 @@ import io.github.rosemoe.sora.widget.base.EditorPopupWindow; */ public class SignatureHelpWindow extends BaseEditorWindow { - private static final Logger LOG = Logger.instance("SignatureHelpWindow"); + private static final Logger LOG = Logger.newInstance ("SignatureHelpWindow"); /** * Create a signature help popup window for editor 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 0ff16f482..47deb747b 100644 --- a/common/src/main/java/com/itsaky/androidide/colorpicker/ColorPickerView.java +++ b/common/src/main/java/com/itsaky/androidide/colorpicker/ColorPickerView.java @@ -55,7 +55,7 @@ public class ColorPickerView extends LinearLayout { private final LayoutColorPickerBinding binding; private final int DEFAULT_COLOR; - private static final Logger LOG = Logger.instance("ColorPickerView"); + private static final Logger LOG = Logger.newInstance ("ColorPickerView"); private final Slider.OnChangeListener mValueChangeListener = (slider, value, fromUser) -> { 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 6169ed74c..af291620f 100755 --- a/common/src/main/java/com/itsaky/androidide/managers/ToolsManager.java +++ b/common/src/main/java/com/itsaky/androidide/managers/ToolsManager.java @@ -33,7 +33,7 @@ public class ToolsManager { public static final int LOG_SENDER_VERSION = 2; public static final String KEY_LOG_SENDER_VERSION = "tools_logsenderVersion"; - private static final Logger LOG = Logger.instance("ToolsManager"); + private static final Logger LOG = Logger.newInstance ("ToolsManager"); public static String ARCH_SPECIFIC_ASSET_DATA_DIR = "data/" + BaseApplication.getArch(); public static String COMMON_ASSET_DATA_DIR = "data/common"; private static PreferenceManager prefs; 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 63cdd447e..9ba695a5f 100755 --- a/common/src/main/java/com/itsaky/androidide/shell/ShellServer.java +++ b/common/src/main/java/com/itsaky/androidide/shell/ShellServer.java @@ -38,7 +38,7 @@ public class ShellServer extends Thread { private BufferedReader output; private Process process; - private static final Logger LOG = Logger.instance("ShellServer"); + private static final Logger LOG = Logger.newInstance ("ShellServer"); public ShellServer( Callback callback, 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 13c0843ec..f8f931d14 100644 --- a/common/src/main/java/com/itsaky/androidide/utils/BootstrapInstaller.java +++ b/common/src/main/java/com/itsaky/androidide/utils/BootstrapInstaller.java @@ -50,7 +50,7 @@ import java.util.zip.ZipInputStream; */ public class BootstrapInstaller { - private static final Logger LOG = Logger.instance("BootstrapInstaller"); + private static final Logger LOG = Logger.newInstance ("BootstrapInstaller"); @NonNull public static CompletableFuture 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 0ce4d3747..1eb6961e7 100755 --- a/common/src/main/java/com/itsaky/androidide/utils/Environment.java +++ b/common/src/main/java/com/itsaky/androidide/utils/Environment.java @@ -40,7 +40,7 @@ public final class Environment { public static final String DEFAULT_HOME = DEFAULT_ROOT + "/framework"; private static final String DEFAULT_JAVA_HOME = DEFAULT_HOME + "/jdk"; private static final String DEFAULT_ANDROID_HOME = DEFAULT_HOME + "/android-sdk"; - private static final Logger LOG = Logger.instance("Environment"); + private static final Logger LOG = Logger.newInstance ("Environment"); private static final List blacklist = new ArrayList<>(); public static File ROOT; public static File SYSROOT; diff --git a/common/src/main/java/com/itsaky/androidide/utils/Logger.java b/common/src/main/java/com/itsaky/androidide/utils/Logger.java index 3abc5051d..36c28d2c9 100755 --- a/common/src/main/java/com/itsaky/androidide/utils/Logger.java +++ b/common/src/main/java/com/itsaky/androidide/utils/Logger.java @@ -18,12 +18,16 @@ package com.itsaky.androidide.utils; import android.util.Log; + import androidx.annotation.NonNull; + import com.blankj.utilcode.util.ThrowableUtils; + +import org.jetbrains.annotations.Contract; + import java.util.ArrayList; import java.util.List; import java.util.Objects; -import org.jetbrains.annotations.Contract; /** * Logger for the IDE. @@ -69,7 +73,7 @@ public class Logger { @NonNull @Contract("_ -> new") - public static Logger instance(String tag) { + public static Logger newInstance(String tag) { return createInstance(tag); } 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 4e49e7803..1f1f2a65b 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 @@ -72,7 +72,7 @@ data class CompletionItem(@JvmField var label: String, ) companion object { - private val LOG = Logger.instance("CompletionItem") + private val LOG = Logger.newInstance("CompletionItem") } fun setLabel(label: String) { 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 558f3a858..aa7d57f2b 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 @@ -347,5 +347,5 @@ public class FileStore { } } - private static final Logger LOG = Logger.instance("FileStore"); + private static final Logger LOG = Logger.newInstance ("FileStore"); } 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 7367f1fed..ce844e006 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 @@ -64,7 +64,7 @@ import java.util.concurrent.CompletableFuture; public class JavaLanguageServer implements ILanguageServer, IDocumentHandler { - private static final Logger LOG = Logger.instance("JavaLanguageServer"); + private static final Logger LOG = Logger.newInstance ("JavaLanguageServer"); private final AnalyzeTimer analyzeTimer; private ILanguageClient client; private IServerSettings settings; 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 6dfeab70d..32ee0855a 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 @@ -41,7 +41,7 @@ import javax.tools.JavaFileObject; public class CompileBatch implements AutoCloseable { - private static final Logger LOG = Logger.instance("CompileBatch"); + private static final Logger LOG = Logger.newInstance ("CompileBatch"); private static final Path FILE_NOT_FOUND = Paths.get(""); final JavaCompilerService parent; final ReusableCompiler.Borrow borrow; 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 c4605ba78..e3b765cf6 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 @@ -368,5 +368,5 @@ public class JavaCompilerService implements CompilerProvider { } } - private static final Logger LOG = Logger.instance("JavaCompilerService"); + private static final Logger LOG = Logger.newInstance ("JavaCompilerService"); } 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 7c6630e34..dd198fa4a 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 @@ -76,7 +76,7 @@ import javax.tools.JavaFileObject; */ public class ReusableCompiler { - private static final Logger LOG = Logger.instance("ReusableCompiler"); + private static final Logger LOG = Logger.newInstance ("ReusableCompiler"); private static final JavacTool systemProvider = JavacTool.create(); private final List 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 2173fa0ce..854911471 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 @@ -34,8 +34,6 @@ package com.itsaky.lsp.java.compiler; -import static com.itsaky.androidide.utils.Logger.instance; - import androidx.annotation.NonNull; import com.itsaky.androidide.utils.Logger; import java.util.concurrent.Semaphore; @@ -44,7 +42,7 @@ import kotlin.jvm.functions.Function1; public class SynchronizedTask { - private static final Logger LOG = instance("SynchronizedTask"); + private static final Logger LOG = Logger.newInstance ("SynchronizedTask"); private final Semaphore semaphore = new Semaphore(1); private volatile boolean isWriting; private CompileTask task; 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 4048bcde9..cd9ba444b 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 @@ -484,5 +484,5 @@ public class Parser { return ""; } - private static final Logger LOG = Logger.instance("JavaParser"); + private static final Logger LOG = Logger.newInstance ("JavaParser"); } diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/providers/CodeActionProvider.java b/lsp/java/src/main/java/com/itsaky/lsp/java/providers/CodeActionProvider.java index 997fcf523..21b0033a0 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/providers/CodeActionProvider.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/providers/CodeActionProvider.java @@ -88,7 +88,7 @@ public class CodeActionProvider { Pattern.compile("^'((\\w+\\.)*\\w+)' is not thrown"); private static final Pattern UNREPORTED_EXCEPTION = Pattern.compile("unreported exception ((\\w+\\.)*\\w+)"); - private static final Logger LOG = Logger.instance("JavaCodeActionProvider"); + private static final Logger LOG = Logger.newInstance ("JavaCodeActionProvider"); private final CompilerProvider compiler; public CodeActionProvider(CompilerProvider compiler) { 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 c2ae2aa94..f19bb26d6 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 @@ -17,8 +17,6 @@ package com.itsaky.lsp.java.providers; -import static com.itsaky.androidide.utils.Logger.instance; - import androidx.annotation.NonNull; import com.google.common.io.CharSink; import com.google.common.io.CharSource; @@ -37,7 +35,7 @@ import java.io.Writer; */ public class CodeFormatProvider { - private static final Logger LOG = instance("JavaCodeFormatProvider"); + private static final Logger LOG = Logger.newInstance ("JavaCodeFormatProvider"); private final JavaServerSettings settings; 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 ea10bba0f..eb8cdff1a 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 @@ -154,7 +154,7 @@ public class CompletionProvider extends AbstractServiceProvider implements IComp "float", "double", }; - private static final Logger LOG = Logger.instance("JavaCompletionProvider"); + private static final Logger LOG = Logger.newInstance ("JavaCompletionProvider"); private final CompilerProvider compiler; private Path completingFile; private long cursor; 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 9bfffdc2c..6764fe2e5 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 @@ -45,7 +45,7 @@ import javax.tools.JavaFileObject; public class DefinitionProvider { public static final List NOT_SUPPORTED = Collections.emptyList(); - private static final Logger LOG = Logger.instance("JavaDefinitionProvider"); + private static final Logger LOG = Logger.newInstance ("JavaDefinitionProvider"); private final CompilerProvider compiler; private Path file; private int line, column; 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 cccb98224..e1a4329bf 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 @@ -32,7 +32,7 @@ import com.sun.source.tree.CompilationUnitTree; */ public class JavaSelectionProvider { - private static final Logger LOG = Logger.instance("JavaSelectionProvider"); + private static final Logger LOG = Logger.newInstance ("JavaSelectionProvider"); private final CompilerProvider compiler; public JavaSelectionProvider(CompilerProvider compiler) { 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 ef377d87f..1450bab7a 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 @@ -49,7 +49,7 @@ import javax.lang.model.type.DeclaredType; import javax.lang.model.type.TypeMirror; public class CreateMissingMethod extends Rewrite { - private static final Logger LOG = Logger.instance("main"); + private static final Logger LOG = Logger.newInstance ("main"); final Path file; final int position; int argCount = -1; 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 f683c9217..81b517594 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 @@ -45,7 +45,7 @@ import javax.lang.model.element.TypeElement; public class GenerateRecordConstructor extends Rewrite { - private static final Logger LOG = Logger.instance("main"); + private static final Logger LOG = Logger.newInstance ("main"); final String className; public GenerateRecordConstructor(String className) { 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 42a9f1cda..2f5973bdf 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 @@ -48,7 +48,7 @@ import javax.lang.model.util.Elements; public class ImplementAbstractMethods extends Rewrite { - private static final Logger LOG = Logger.instance("main"); + private static final Logger LOG = Logger.newInstance ("main"); private final String className; private final String classFile; private final long position; 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 3178c54d3..c100a7396 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 @@ -67,5 +67,5 @@ public class ScanClassPath { } } - private static final Logger LOG = Logger.instance("ScanClassPath"); + private static final Logger LOG = Logger.newInstance ("ScanClassPath"); } 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 08e9167a4..f2ebff464 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 @@ -520,5 +520,5 @@ public class StringSearch { private static final ThreadLocal SKIP_CHAR_BUFFER = ThreadLocal.withInitial(StringSearch::charArray); - private static final Logger LOG = Logger.instance("StringSearch"); + private static final Logger LOG = Logger.newInstance ("StringSearch"); } diff --git a/lsp/java/src/main/java/com/itsaky/lsp/java/visitors/DiagnosticVisitor.java b/lsp/java/src/main/java/com/itsaky/lsp/java/visitors/DiagnosticVisitor.java index cce07498f..38e229dbc 100644 --- a/lsp/java/src/main/java/com/itsaky/lsp/java/visitors/DiagnosticVisitor.java +++ b/lsp/java/src/main/java/com/itsaky/lsp/java/visitors/DiagnosticVisitor.java @@ -309,5 +309,5 @@ public class DiagnosticVisitor extends TreeScanner> } } - private static final Logger LOG = Logger.instance("main"); + private static final Logger LOG = Logger.newInstance ("main"); } 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 5eacabe83..38b593367 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 @@ -56,7 +56,7 @@ public class FindBiggerRange extends TreeScanner { final Range treeRange = getRange(tree); if (treeRange != null && range.isSmallerThan(treeRange)) { - Logger.instance("FindBiggerRange") + Logger.newInstance ("FindBiggerRange") .debug("Selecting tree", tree, tree.getClass(), tree.getKind()); return treeRange; } 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 7667359ac..8ab291e0d 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 @@ -139,5 +139,5 @@ public class FindCompletionsAt extends TreePathScanner { return b; } - private static final Logger LOG = Logger.instance("FindCompletionsAt"); + private static final Logger LOG = Logger.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 f76dd2b2c..0b13c929d 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 @@ -259,5 +259,5 @@ public class FindMethodCallAt extends TreePathScanner 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 b4f76e974..0a92bccc2 100644 --- a/xml-inflater/src/main/java/com/itsaky/inflater/XMLLayoutInflater.java +++ b/xml-inflater/src/main/java/com/itsaky/inflater/XMLLayoutInflater.java @@ -68,7 +68,7 @@ class XMLLayoutInflater extends BaseLayoutInflater { private ContextProvider contextProvider; - private static final Logger LOG = Logger.instance("XMLLayoutInflater"); + private static final Logger LOG = Logger.newInstance ("XMLLayoutInflater"); public static final String ATTR_ADAPTER_SUFFIX = "AttrAdapter"; XMLLayoutInflater(@NonNull LayoutInflaterConfiguration config) { 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 abd6c3799..91823ee99 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 @@ -45,7 +45,7 @@ import com.itsaky.xml.INamespace; */ public class ViewAttrAdapter extends CommonParseUtils implements IAttributeAdapter { - protected static final Logger LOG = Logger.instance("BaseViewAttrAdapter"); + protected static final Logger LOG = Logger.newInstance ("BaseViewAttrAdapter"); public ViewAttrAdapter(@NonNull IResourceTable resourceFinder, DisplayMetrics displayMetrics) { super(resourceFinder, displayMetrics); 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 2dec708f7..267e987c4 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 @@ -45,7 +45,7 @@ import org.xmlpull.v1.XmlPullParserFactory; */ public abstract class DrawableParserFactory { - private static final Logger LOG = Logger.instance("IDrawableParser"); + private static final Logger LOG = Logger.newInstance ("IDrawableParser"); /** * Create a new drawable parser for the given file. If the given file is not an XML Document, 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 287cce360..c9f34fb68 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 @@ -34,7 +34,7 @@ import org.xmlpull.v1.XmlPullParser; */ public class StateListParser extends IDrawableParser { - private static final Logger LOG = Logger.instance("StateListParser"); + private static final Logger LOG = Logger.newInstance ("StateListParser"); protected StateListParser( XmlPullParser parser, 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 ff5ee8422..a68e1dfe1 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 @@ -50,7 +50,7 @@ public abstract class BaseView implements IView { protected Object stored; private boolean isPlaceholder; - protected final Logger LOG = Logger.instance(getClass().getSimpleName()); + protected final Logger LOG = Logger.newInstance (getClass().getSimpleName()); public BaseView(String qualifiedName, View view) { this(qualifiedName, view, false); 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 abcd58a37..fc4d48f09 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 @@ -51,7 +51,7 @@ public class CommonParseUtils { protected IResourceTable resourceFinder; protected final DisplayMetrics displayMetrics; - private static final Logger LOG = Logger.instance("CommonParseUtils"); + private static final Logger LOG = Logger.newInstance ("CommonParseUtils"); public CommonParseUtils(@NonNull IResourceTable resourceFinder, DisplayMetrics displayMetrics) { this.resourceFinder = resourceFinder; 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 24ab1816e..79f22c8e6 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 @@ -46,7 +46,7 @@ import org.xmlpull.v1.XmlPullParserFactory; */ public class ValuesTable { - private static final Logger LOG = Logger.instance("ValuesTable"); + private static final Logger LOG = Logger.newInstance ("ValuesTable"); // TODO Parse styles and styleables private final Map 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 bd516a503..1b6310fff 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 @@ -32,7 +32,7 @@ import java.util.regex.Pattern; public class ValuesTableFactory { private static final Map valueTables = new HashMap<>(); - private static final Logger LOG = Logger.instance("ValuesTableFactory"); + private static final Logger LOG = Logger.newInstance ("ValuesTableFactory"); public static ValuesTable getTable(final File resDir) { return valueTables.getOrDefault(resDir, null); 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 8ed2b7d27..a685baa58 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 @@ -24,7 +24,7 @@ import java.util.ArrayList; /** This class is a duplicate of the PathParser.java in androidx.core.graphics package. */ public class PathParser { - private static final Logger LOG = Logger.instance("PathParser"); + private static final Logger LOG = Logger.newInstance ("PathParser"); // Copy from Arrays.copyOfRange() which is only available from API level 9. /**