refactor: move ProgressListener to common module

eclipse · Jan 19, 2022 · 4d3d201 · 4d3d201
1 parent 4ed3f3e
commit 4d3d201
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 21 deletions.
diff --git a/...jifa/hda/api/DefaultProgressListener.java → ...mon/listener/DefaultProgressListener.java b/...jifa/hda/api/DefaultProgressListener.java → ...mon/listener/DefaultProgressListener.java
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2021 Contributors to the Eclipse Foundation
+ * Copyright (c) 2021, 2022 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
  * information regarding copyright ownership.
@@ -11,7 +11,7 @@
  * SPDX-License-Identifier: EPL-2.0
  ********************************************************************************/
 
-package org.eclipse.jifa.hda.api;
+package org.eclipse.jifa.common.listener;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;

diff --git a/...se/jifa/hda/api/NoOpProgressListener.java → ...common/listener/NoOpProgressListener.java b/...se/jifa/hda/api/NoOpProgressListener.java → ...common/listener/NoOpProgressListener.java
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2021 Contributors to the Eclipse Foundation
+ * Copyright (c) 2021, 2022 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
  * information regarding copyright ownership.
@@ -11,7 +11,7 @@
  * SPDX-License-Identifier: EPL-2.0
  ********************************************************************************/
 
-package org.eclipse.jifa.hda.api;
+package org.eclipse.jifa.common.listener;
 
 class NoOpProgressListener implements ProgressListener {
 

diff --git a/...clipse/jifa/hda/api/ProgressListener.java → ...ifa/common/listener/ProgressListener.java b/...clipse/jifa/hda/api/ProgressListener.java → ...ifa/common/listener/ProgressListener.java
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2021 Contributors to the Eclipse Foundation
+ * Copyright (c) 2021, 2022 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
  * information regarding copyright ownership.
@@ -11,7 +11,7 @@
  * SPDX-License-Identifier: EPL-2.0
  ********************************************************************************/
 
-package org.eclipse.jifa.hda.api;
+package org.eclipse.jifa.common.listener;
 
 public interface ProgressListener {
 

diff --git a/...heap-dump-analyzer/api/src/main/java/org/eclipse/jifa/hda/api/FilterProgressListener.java b/...heap-dump-analyzer/api/src/main/java/org/eclipse/jifa/hda/api/FilterProgressListener.java
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2021 Contributors to the Eclipse Foundation
+ * Copyright (c) 2021, 2022 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
  * information regarding copyright ownership.
@@ -13,6 +13,8 @@
 
 package org.eclipse.jifa.hda.api;
 
+import org.eclipse.jifa.common.listener.ProgressListener;
+
 public class FilterProgressListener implements ProgressListener {
 
  ProgressListener listener;

diff --git a/backend/heap-dump-analyzer/api/src/main/java/org/eclipse/jifa/hda/api/HeapDumpAnalyzer.java b/backend/heap-dump-analyzer/api/src/main/java/org/eclipse/jifa/hda/api/HeapDumpAnalyzer.java
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2021 Contributors to the Eclipse Foundation
+ * Copyright (c) 2021, 2022 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
  * information regarding copyright ownership.
@@ -12,6 +12,7 @@
  ********************************************************************************/
 package org.eclipse.jifa.hda.api;
 
+import org.eclipse.jifa.common.listener.ProgressListener;
 import org.eclipse.jifa.common.vo.PageView;
 import org.eclipse.jifa.common.vo.support.SearchType;
 

diff --git a/...heap-dump-analyzer/impl/src/main/java/org/eclipse/jifa/hda/impl/HeapDumpAnalyzerImpl.java b/...heap-dump-analyzer/impl/src/main/java/org/eclipse/jifa/hda/impl/HeapDumpAnalyzerImpl.java
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2021 Contributors to the Eclipse Foundation
+ * Copyright (c) 2021, 2022 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
  * information regarding copyright ownership.
@@ -25,7 +25,7 @@
 import org.eclipse.jifa.hda.api.AnalysisException;
 import org.eclipse.jifa.hda.api.HeapDumpAnalyzer;
 import org.eclipse.jifa.hda.api.Model;
-import org.eclipse.jifa.hda.api.ProgressListener;
+import org.eclipse.jifa.common.listener.ProgressListener;
 import org.eclipse.mat.SnapshotException;
 import org.eclipse.mat.internal.snapshot.SnapshotQueryContext;
 import org.eclipse.mat.parser.model.ClassImpl;
@@ -88,7 +88,7 @@
 
 import static org.eclipse.jifa.common.vo.support.SearchPredicate.createPredicate;
 import static org.eclipse.jifa.hda.api.Model.*;
-import static org.eclipse.jifa.hda.api.ProgressListener.NoOpProgressListener;
+import static org.eclipse.jifa.common.listener.ProgressListener.NoOpProgressListener;
 import static org.eclipse.jifa.hda.impl.AnalysisContext.ClassLoaderExplorerData;
 import static org.eclipse.jifa.hda.impl.AnalysisContext.DirectByteBufferData;
 

diff --git a/...heap-dump-analyzer/impl/src/main/java/org/eclipse/jifa/hda/impl/ProgressListenerImpl.java b/...heap-dump-analyzer/impl/src/main/java/org/eclipse/jifa/hda/impl/ProgressListenerImpl.java
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2021 Contributors to the Eclipse Foundation
+ * Copyright (c) 2021, 2022 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
  * information regarding copyright ownership.
@@ -14,7 +14,7 @@
 package org.eclipse.jifa.hda.impl;
 
 import org.eclipse.jifa.hda.api.FilterProgressListener;
-import org.eclipse.jifa.hda.api.ProgressListener;
+import org.eclipse.jifa.common.listener.ProgressListener;
 import org.eclipse.mat.util.IProgressListener;
 
 public class ProgressListenerImpl extends FilterProgressListener implements IProgressListener {

diff --git a/.../heap-dump-analyzer/provider/src/main/java/org/eclipse/jifa/hdp/provider/MATProvider.java b/.../heap-dump-analyzer/provider/src/main/java/org/eclipse/jifa/hdp/provider/MATProvider.java
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2021 Contributors to the Eclipse Foundation
+ * Copyright (c) 2021, 2022 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
  * information regarding copyright ownership.
@@ -15,7 +15,7 @@
 
 import org.eclipse.jifa.common.JifaException;
 import org.eclipse.jifa.hda.api.HeapDumpAnalyzer;
-import org.eclipse.jifa.hda.api.ProgressListener;
+import org.eclipse.jifa.common.listener.ProgressListener;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleException;
 import org.osgi.framework.Constants;
@@ -60,6 +60,7 @@ private void init() {
  commonBase + ".cache",
  commonBase + ".vo",
  commonBase + ".vo.support",
+ commonBase + ".listener",
  "net.sf.cglib.beans",
  "net.sf.cglib.core",
  "net.sf.cglib.core.internal",

diff --git a/backend/worker/src/main/java/org/eclipse/jifa/worker/route/heapdump/HeapBaseRoute.java b/backend/worker/src/main/java/org/eclipse/jifa/worker/route/heapdump/HeapBaseRoute.java
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2020, 2021 Contributors to the Eclipse Foundation
+ * Copyright (c) 2020, 2022 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
  * information regarding copyright ownership.
@@ -13,7 +13,7 @@
 package org.eclipse.jifa.worker.route.heapdump;
 
 import org.eclipse.jifa.hda.api.HeapDumpAnalyzer;
-import org.eclipse.jifa.hda.api.ProgressListener;
+import org.eclipse.jifa.common.listener.ProgressListener;
 import org.eclipse.jifa.worker.route.BaseRoute;
 import org.eclipse.jifa.worker.route.MappingPrefix;
 import org.eclipse.jifa.worker.support.Analyzer;

diff --git a/backend/worker/src/main/java/org/eclipse/jifa/worker/support/Analyzer.java b/backend/worker/src/main/java/org/eclipse/jifa/worker/support/Analyzer.java
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2020, 2021 Contributors to the Eclipse Foundation
+ * Copyright (c) 2020, 2022 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
  * information regarding copyright ownership.
@@ -20,10 +20,9 @@
 import org.eclipse.jifa.common.enums.ProgressState;
 import org.eclipse.jifa.common.util.ErrorUtil;
 import org.eclipse.jifa.common.util.FileUtil;
-import org.eclipse.jifa.hda.api.DefaultProgressListener;
+import org.eclipse.jifa.common.listener.DefaultProgressListener;
 import org.eclipse.jifa.hda.api.HeapDumpAnalyzer;
-import org.eclipse.jifa.hda.api.ProgressListener;
-import org.eclipse.jifa.worker.Constant;
+import org.eclipse.jifa.common.listener.ProgressListener;
 import org.eclipse.jifa.worker.Worker;
 import org.eclipse.jifa.worker.WorkerGlobal;
 import org.slf4j.Logger;