From 109c9f2db17434ba33305e0d074941024b8f1491 Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Fri, 15 Mar 2019 12:11:51 +0100
Subject: [PATCH] unused attributes removed
---
.../cdplugin/copypaste/CopyAction.java | 7 +--
.../copypaste/CopyPasteAbstractAction.java | 45 -------------------
.../cdplugin/copypaste/PasteAction.java | 3 --
.../mapviewer/cdplugin/AllCdPluginTests.java | 13 ++++++
.../cdplugin/copypaste/AllCopyPasteTests.java | 11 +++++
5 files changed, 26 insertions(+), 53 deletions(-)
create mode 100644 CellDesigner-plugin/src/test/java/lcsb/mapviewer/cdplugin/AllCdPluginTests.java
create mode 100644 CellDesigner-plugin/src/test/java/lcsb/mapviewer/cdplugin/copypaste/AllCopyPasteTests.java
diff --git a/CellDesigner-plugin/src/main/java/lcsb/mapviewer/cdplugin/copypaste/CopyAction.java b/CellDesigner-plugin/src/main/java/lcsb/mapviewer/cdplugin/copypaste/CopyAction.java
index 159598e7dc..31bd6b1b61 100644
--- a/CellDesigner-plugin/src/main/java/lcsb/mapviewer/cdplugin/copypaste/CopyAction.java
+++ b/CellDesigner-plugin/src/main/java/lcsb/mapviewer/cdplugin/copypaste/CopyAction.java
@@ -12,7 +12,7 @@ import lcsb.mapviewer.common.SystemClipboard;
import lcsb.mapviewer.common.exception.InvalidXmlSchemaException;
/**
- * CD Plugin action resposible for translating annotation stored in notes to xml
+ * CD Plugin action responsible for translating annotation stored in notes to xml
* format stored in annotations.
*
* @author Piotr Gawron
@@ -25,7 +25,7 @@ public class CopyAction extends CopyPasteAbstractAction {
private final Logger logger = Logger.getLogger(CopyAction.class.getName());
/**
- * Method that perform annotation of a celldesigner species listed in
+ * Method that perform annotation of a CellDesigner species listed in
* speciesList.
*
* @param plug
@@ -44,9 +44,6 @@ public class CopyAction extends CopyPasteAbstractAction {
SystemClipboard sc = new SystemClipboard();
- this.setWindow(win);
- this.setPlug(plug);
-
int size = speciesList.size();
PluginSBase chosenElement = null;
diff --git a/CellDesigner-plugin/src/main/java/lcsb/mapviewer/cdplugin/copypaste/CopyPasteAbstractAction.java b/CellDesigner-plugin/src/main/java/lcsb/mapviewer/cdplugin/copypaste/CopyPasteAbstractAction.java
index 04180351ed..bc1884ceaa 100644
--- a/CellDesigner-plugin/src/main/java/lcsb/mapviewer/cdplugin/copypaste/CopyPasteAbstractAction.java
+++ b/CellDesigner-plugin/src/main/java/lcsb/mapviewer/cdplugin/copypaste/CopyPasteAbstractAction.java
@@ -5,7 +5,6 @@ import java.util.Set;
import org.apache.log4j.Logger;
-import jp.sbi.celldesigner.MainWindow;
import lcsb.mapviewer.common.Pair;
import lcsb.mapviewer.common.exception.InvalidXmlSchemaException;
import lcsb.mapviewer.converter.annotation.XmlAnnotationParser;
@@ -32,15 +31,6 @@ public class CopyPasteAbstractAction {
* stored in system clipboard.
*/
private static final String PREFIX = "[MIRIAM]";
- /**
- * Plugin object which ran this action. This object is used to update
- * information about species
- */
- private CopyPastePlugin plug;
- /**
- * Object of CellDesigner main form.
- */
- private MainWindow window;
/**
* Serializes {@link MiriamData} into string that will be stored into system
@@ -148,39 +138,4 @@ public class CopyPasteAbstractAction {
return new Pair<Set<MiriamData>, String>(set, notes);
}
-
- /**
- * @return the plug
- * @see #plug
- */
- protected CopyPastePlugin getPlug() {
- return plug;
- }
-
- /**
- * @param plug
- * the plug to set
- * @see #plug
- */
- protected void setPlug(CopyPastePlugin plug) {
- this.plug = plug;
- }
-
- /**
- * @return the window
- * @see #window
- */
- protected MainWindow getWindow() {
- return window;
- }
-
- /**
- * @param window
- * the window to set
- * @see #window
- */
- protected void setWindow(MainWindow window) {
- this.window = window;
- }
-
}
\ No newline at end of file
diff --git a/CellDesigner-plugin/src/main/java/lcsb/mapviewer/cdplugin/copypaste/PasteAction.java b/CellDesigner-plugin/src/main/java/lcsb/mapviewer/cdplugin/copypaste/PasteAction.java
index 4715616172..c621f3fcb6 100644
--- a/CellDesigner-plugin/src/main/java/lcsb/mapviewer/cdplugin/copypaste/PasteAction.java
+++ b/CellDesigner-plugin/src/main/java/lcsb/mapviewer/cdplugin/copypaste/PasteAction.java
@@ -55,9 +55,6 @@ public class PasteAction extends CopyPasteAbstractAction {
String notes = data.getRight();
Set<MiriamData> set = data.getLeft();
- this.setWindow(win);
- this.setPlug(plug);
-
int size = speciesList.size();
for (int i = 0; i < size; i++) {
PluginSBase element = speciesList.get(i);
diff --git a/CellDesigner-plugin/src/test/java/lcsb/mapviewer/cdplugin/AllCdPluginTests.java b/CellDesigner-plugin/src/test/java/lcsb/mapviewer/cdplugin/AllCdPluginTests.java
new file mode 100644
index 0000000000..f1235c0a0f
--- /dev/null
+++ b/CellDesigner-plugin/src/test/java/lcsb/mapviewer/cdplugin/AllCdPluginTests.java
@@ -0,0 +1,13 @@
+package lcsb.mapviewer.cdplugin;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
+
+import lcsb.mapviewer.cdplugin.copypaste.AllCopyPasteTests;
+
+@RunWith(Suite.class)
+@SuiteClasses({ AllCopyPasteTests.class })
+public class AllCdPluginTests {
+
+}
diff --git a/CellDesigner-plugin/src/test/java/lcsb/mapviewer/cdplugin/copypaste/AllCopyPasteTests.java b/CellDesigner-plugin/src/test/java/lcsb/mapviewer/cdplugin/copypaste/AllCopyPasteTests.java
new file mode 100644
index 0000000000..3858371717
--- /dev/null
+++ b/CellDesigner-plugin/src/test/java/lcsb/mapviewer/cdplugin/copypaste/AllCopyPasteTests.java
@@ -0,0 +1,11 @@
+package lcsb.mapviewer.cdplugin.copypaste;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
+
+@RunWith(Suite.class)
+@SuiteClasses({ CopyPasteAbstractActionTest.class })
+public class AllCopyPasteTests {
+
+}
--
GitLab