From 91b6567b6bd40df0bc0a43592ce7bd7932800e1b Mon Sep 17 00:00:00 2001
From: De <denise.slenter@maastrichtuniversity.nl>
Date: Wed, 25 Apr 2018 17:24:31 +0200
Subject: [PATCH] Fix #2

Added a call in the typeconverter.java script, to enable the change of DataNodes to Labels (which was already defined inDatanodetoLabel.java ).
---
 .classpath                                    |  7 +++++
 .gitignore                                    |  1 +
 .project                                      | 28 +++++++++++++++++++
 META-INF/MANIFEST.MF                          |  3 +-
 README.md                                     |  2 +-
 build.properties                              |  3 ++
 .../typeconverter/TypeConverter.java          | 10 +++++--
 7 files changed, 49 insertions(+), 5 deletions(-)
 create mode 100644 .classpath
 create mode 100644 .project
 create mode 100644 build.properties

diff --git a/.classpath b/.classpath
new file mode 100644
index 0000000..751c8f2
--- /dev/null
+++ b/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/.gitignore b/.gitignore
index 0f182a0..e2f0db3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 *.jar
 *.war
 *.ear
+/bin/
diff --git a/.project b/.project
new file mode 100644
index 0000000..7338395
--- /dev/null
+++ b/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.pathvisio.typeconverter</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+	</natures>
+</projectDescription>
diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
index d4d97cd..9dc6f5d 100644
--- a/META-INF/MANIFEST.MF
+++ b/META-INF/MANIFEST.MF
@@ -4,7 +4,8 @@ Bundle-Name: org.pathvisio.typeconverter
 Bundle-SymbolicName: org.pathvisio.typeconverter
 Bundle-Version: 1.1.0
 Bundle-Activator: org.pathvisio.typeconverter.Activator
-Import-Package: org.osgi.framework;version="1.5.0"
 Require-Bundle: org.pathvisio.core;bundle-version="3.0.0",
  org.pathvisio.desktop;bundle-version="3.0.0",
  org.pathvisio.gui;bundle-version="3.0.0"
+Import-Package: org.osgi.framework;version="1.5.0"
+Export-Package: org.pathvisio.typeconverter
diff --git a/README.md b/README.md
index cef7695..9886f76 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
 org.pathvisio.typeconverter
 ===========================
 
-Enables the conversion of pathway elements into other types (e.g. Label into Metabolite)
+This plugin for Pathvisio enables the conversion of pathway elements into other types (e.g. Label into Metabolite).
diff --git a/build.properties b/build.properties
new file mode 100644
index 0000000..b107977
--- /dev/null
+++ b/build.properties
@@ -0,0 +1,3 @@
+source.. = src/
+bin.includes = META-INF/,\
+               .
diff --git a/src/org/pathvisio/typeconverter/TypeConverter.java b/src/org/pathvisio/typeconverter/TypeConverter.java
index 5e8dbdc..e6efca9 100644
--- a/src/org/pathvisio/typeconverter/TypeConverter.java
+++ b/src/org/pathvisio/typeconverter/TypeConverter.java
@@ -103,10 +103,14 @@ public void pathwayElementMenuHook(VPathwayElement e, JPopupMenu menu) {
 				DataNodeToDataNode action5 = new DataNodeToDataNode((Graphics)e, DataNodeType.RNA);
 				refMenu.add(action5);
 			}
-			DataNodeToLabel action6 = new DataNodeToLabel((Graphics)e, ObjectType.LABEL );
-			refMenu.add(action6);
+			if(!DataNodeType.byName(dnType).equals(ObjectType.LABEL)) {
+				DataNodeToLabel action6 = new DataNodeToLabel((Graphics)e, ObjectType.LABEL);
+				refMenu.add(action6);
+			}
+//			DataNodeToLabel action7 = new DataNodeToLabel((Graphics)e, ObjectType.LABEL );
+//			refMenu.add(action7);
 			menu.add(refMenu);
+			
 		}
 	}
-
 }