implement diagnostic presenter

Author: tranleduy2000

app/src/main/java/com/duy/ccppcompiler/compiler/CompileManager.java

@@ -20,7 +20,10 @@
 import android.content.Intent;
 
 import com.duy.ccppcompiler.R;
+import com.duy.ccppcompiler.compiler.diagnostic.DiagnosticsCollector;
+import com.duy.ccppcompiler.compiler.diagnostic.OutputParser;
 import com.duy.ccppcompiler.console.ConsoleActivity;
+import com.duy.ccppcompiler.diagnostic.DiagnosticPresenter;
 import com.duy.common.DLog;
 import com.duy.ide.compiler.ICompileManager;
 import com.duy.ide.compiler.shell.ShellResult;
@@ -37,8 +40,9 @@ public class CompileManager implements ICompileManager {
     private static final String TAG = "CompileManager";
     private ProgressDialog mCompileDialog;
     private EditorActivity mActivity;
+    private DiagnosticPresenter mDiagnosticPresenter;
 
-    CompileManager(EditorActivity activity) {
+    public CompileManager(EditorActivity activity) {
         mCompileDialog = new ProgressDialog(activity);
         mActivity = activity;
     }
@@ -80,6 +84,15 @@ public void onCompileFailed(ShellResult shellResult) {
             mCompileDialog.setMessage(shellResult.getMessage());
         }
         if (DLog.DEBUG) DLog.w(TAG, "onCompileFailed: \n" + shellResult.getMessage());
+        if (mDiagnosticPresenter != null) {
+            DiagnosticsCollector diagnosticsCollector = new DiagnosticsCollector<>();
+            OutputParser parser = new OutputParser(diagnosticsCollector);
+            parser.parse(shellResult.getMessage());
+            mDiagnosticPresenter.setDiagnostics(diagnosticsCollector.getDiagnostics());
+        }
     }
 
+    public void setDiagnosticPresenter(DiagnosticPresenter diagnosticPresenter) {
+        this.mDiagnosticPresenter = diagnosticPresenter;
+    }
 }

app/src/main/java/com/duy/ccppcompiler/compiler/CompilerFactory.java

@@ -18,9 +18,7 @@
 
 import android.content.Context;
 
-import com.duy.ide.compiler.ICompileManager;
 import com.duy.ide.compiler.INativeCompiler;
-import com.jecelyin.editor.v2.ui.activities.EditorActivity;
 
 /**
  * Created by Duy on 25-Apr-18.
@@ -37,10 +35,6 @@ public static INativeCompiler createCompiler(Context context, CompileType compil
         return new GCCCompiler(context);
     }
 
-    public static ICompileManager createCompileManager(EditorActivity activity) {
-        return new CompileManager(activity);
-    }
-
     /**
      * Created by Duy on 25-Apr-18.
      */

app/src/main/java/com/duy/ccppcompiler/compiler/diagnostic/OutputParser.java

@@ -23,7 +23,7 @@
  * Created by Duy on 28-Apr-18.
  */
 
-public class OutputParser<S> {
+public class OutputParser {
     public static final Pattern PATTERN = Pattern.compile(
             "(.*):" + /*File name*/
                     "([0-9]+):" + /*Line*/
@@ -32,12 +32,13 @@ public class OutputParser<S> {
                     "(.*)" /*Message*/
             , Pattern.CASE_INSENSITIVE);
 
-    private DiagnosticsCollector<? extends S> diagnosticsCollector;
+    private DiagnosticsCollector diagnosticsCollector;
 
-    public OutputParser(DiagnosticsCollector<? extends S> diagnosticsCollector) {
+    public OutputParser(DiagnosticsCollector diagnosticsCollector) {
         this.diagnosticsCollector = diagnosticsCollector;
     }
 
+    @SuppressWarnings("unchecked")
     public void parse(String inputData) {
         Matcher matcher = PATTERN.matcher(inputData);
         while (matcher.find()) {

app/src/main/java/com/jecelyin/editor/v2/ui/diagnostic/DiagnosticAdapter.java renamed to app/src/main/java/com/duy/ccppcompiler/diagnostic/DiagnosticAdapter.java

@@ -1,4 +1,4 @@
-package com.jecelyin.editor.v2.ui.diagnostic;
+package com.duy.ccppcompiler.diagnostic;
 
 import android.content.Context;
 import android.support.annotation.NonNull;
@@ -23,7 +23,7 @@ public class DiagnosticAdapter extends RecyclerView.Adapter<DiagnosticAdapter.Vi
     private Context mContext;
     private DiagnosticClickListener mDiagnosticClickListener;
 
-    public DiagnosticAdapter(List<Diagnostic> diagnostics, Context context) {
+    DiagnosticAdapter(List<Diagnostic> diagnostics, Context context) {
         this.mDiagnostics = diagnostics;
         this.mContext = context;
     }

app/src/main/java/com/jecelyin/editor/v2/ui/diagnostic/DiagnosticClickListener.java renamed to app/src/main/java/com/duy/ccppcompiler/diagnostic/DiagnosticClickListener.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.jecelyin.editor.v2.ui.diagnostic;
+package com.duy.ccppcompiler.diagnostic;
 
 import android.view.View;
 

app/src/main/java/com/jecelyin/editor/v2/ui/diagnostic/DiagnosticContract.java renamed to app/src/main/java/com/duy/ccppcompiler/diagnostic/DiagnosticContract.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.jecelyin.editor.v2.ui.diagnostic;
+package com.duy.ccppcompiler.diagnostic;
 
 import com.duy.ccppcompiler.compiler.diagnostic.Diagnostic;
 
@@ -25,7 +25,7 @@
  */
 
 public class DiagnosticContract {
-    public interface View {
+    public static interface View {
         void show(List<Diagnostic> diagnostics);
 
         void remove(Diagnostic diagnostic);

app/src/main/java/com/duy/ccppcompiler/diagnostic/DiagnosticPresenter.java

@@ -0,0 +1,59 @@
+/*
+ * Copyright 2018 Mr Duy
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.duy.ccppcompiler.diagnostic;
+
+import android.support.annotation.MainThread;
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+
+import com.duy.ccppcompiler.compiler.diagnostic.Diagnostic;
+import com.jecelyin.editor.v2.ui.activities.EditorActivity;
+import com.jecelyin.editor.v2.ui.manager.TabManager;
+
+import java.util.ArrayList;
+
+/**
+ * Created by Duy on 28-Apr-18.
+ */
+
+public class DiagnosticPresenter implements DiagnosticContract.Presenter {
+    private final RecyclerView mRecyclerView;
+    private final EditorActivity mActivity;
+    private final TabManager mTabManager;
+    private ArrayList<Diagnostic> diagnostics;
+    private DiagnosticContract.View mView;
+
+    public DiagnosticPresenter(RecyclerView recyclerView, EditorActivity activity, TabManager tabManager) {
+        this.mRecyclerView = recyclerView;
+        this.mActivity = activity;
+        this.mTabManager = tabManager;
+    }
+
+    @MainThread
+    @Override
+    public void onDiagnosticClick(View view, Diagnostic diagnostic) {
+        // TODO: 28-Apr-18 implement
+    }
+
+    @MainThread
+    public void setDiagnostics(ArrayList<Diagnostic> diagnostics) {
+        this.diagnostics = diagnostics;
+        if (mView != null) {
+            mView.show(diagnostics);
+        }
+    }
+}

app/src/main/java/com/jecelyin/editor/v2/ui/diagnostic/DiagnosticView.java renamed to app/src/main/java/com/duy/ccppcompiler/diagnostic/DiagnosticView.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.jecelyin.editor.v2.ui.diagnostic;
+package com.duy.ccppcompiler.diagnostic;
 
 import android.content.Context;
 import android.support.v7.widget.LinearLayoutManager;

app/src/main/java/com/jecelyin/editor/v2/ui/activities/EditorActivity.java

@@ -44,9 +44,10 @@
 
 import com.afollestad.materialdialogs.folderselector.FolderChooserDialog;
 import com.duy.ccppcompiler.R;
+import com.duy.ccppcompiler.compiler.CompileManager;
 import com.duy.ccppcompiler.compiler.CompilerFactory;
+import com.duy.ccppcompiler.diagnostic.DiagnosticPresenter;
 import com.duy.ide.compiler.CompileTask;
-import com.duy.ide.compiler.ICompileManager;
 import com.duy.ide.compiler.INativeCompiler;
 import com.duy.ide.filemanager.FileManager;
 import com.duy.ide.filemanager.SaveListener;
@@ -110,9 +111,9 @@ public class EditorActivity extends FullScreenActivity
     private Preferences preferences;
     private ClusterCommand clusterCommand;
     private MenuManager mMenuManager;
-    private FolderChooserDialog.FolderCallback findFolderCallback;
     private long mExitTime;
     private SlidingUpPanelLayout mSlidingUpPanelLayout;
+    private DiagnosticPresenter diagnosticPresenter;
 
     @Override
     protected void onRestoreInstanceState(Bundle savedInstanceState) {
@@ -481,7 +482,8 @@ public void onSaved() {
 
                 CompilerFactory.CompileType compileType = CompilerFactory.CompileType.GCC;
                 INativeCompiler compiler = CompilerFactory.createCompiler(EditorActivity.this, compileType);
-                ICompileManager compileManager = CompilerFactory.createCompileManager(EditorActivity.this);
+                CompileManager compileManager = new CompileManager(EditorActivity.this);
+                compileManager.setDiagnosticPresenter(diagnosticPresenter);
 
                 CompileTask compileTask = new CompileTask(compiler, srcFiles, compileManager);
                 compileTask.execute();
@@ -506,9 +508,7 @@ public void closeMenu() {
 
     @Override
     public void onFolderSelection(@NonNull FolderChooserDialog dialog, @NonNull File file) {
-        if (findFolderCallback != null) {
-            findFolderCallback.onFolderSelection(dialog, file);
-        }
+
     }
 
     private void hideSoftInput() {
@@ -633,12 +633,12 @@ public TabManager getTabManager() {
     public boolean onKeyDown(int keyCode, KeyEvent event) {
         if (keyCode == KeyEvent.KEYCODE_BACK && event.getRepeatCount() == 0) {
             if (mDrawerLayout != null) {
-                if (mDrawerLayout.isDrawerOpen(Gravity.LEFT)) {
-                    mDrawerLayout.closeDrawer(Gravity.LEFT);
+                if (mDrawerLayout.isDrawerOpen(Gravity.START)) {
+                    mDrawerLayout.closeDrawer(Gravity.START);
                     return true;
                 }
-                if (mDrawerLayout.isDrawerOpen(Gravity.RIGHT)) {
-                    mDrawerLayout.closeDrawer(Gravity.RIGHT);
+                if (mDrawerLayout.isDrawerOpen(Gravity.END)) {
+                    mDrawerLayout.closeDrawer(Gravity.END);
                     return true;
                 }
             }