Reverted all LibrAlign changes (are now in molecular project)

diff --git a/.gitattributes b/.gitattributes
index 0be4dd5af971964ec9d6b4d2d190691719b90f9f..f8680ab3327f935c405ca6a4fed9d1d84d3c2974 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -367,14 +367,8 @@ eu.etaxonomy.taxeditor.editor/icons/deep-delete-16x16-32.png -text
 eu.etaxonomy.taxeditor.editor/icons/derivate_view-16x16-32.png -text
 eu.etaxonomy.taxeditor.editor/icons/edit_16x16.gif -text
 eu.etaxonomy.taxeditor.editor/icons/emblem-photos.png -text
-eu.etaxonomy.taxeditor.editor/icons/insert-16x16.png -text
 eu.etaxonomy.taxeditor.editor/icons/leaf_detail.png -text
 eu.etaxonomy.taxeditor.editor/icons/link_obj.gif -text
-eu.etaxonomy.taxeditor.editor/icons/overwrite-16x16.png -text
-eu.etaxonomy.taxeditor.editor/icons/pherogram-insert-left-16x16.png -text
-eu.etaxonomy.taxeditor.editor/icons/pherogram-insert-left-disabled-16x16.png -text
-eu.etaxonomy.taxeditor.editor/icons/pherogram-insert-right-16x16.png -text
-eu.etaxonomy.taxeditor.editor/icons/pherogram-insert-right-disabled-16x16.png -text
 eu.etaxonomy.taxeditor.editor/icons/xper64.png -text
 eu.etaxonomy.taxeditor.editor/p2.inf -text
 eu.etaxonomy.taxeditor.editor/plugin.xml -text
@@ -401,7 +395,6 @@ eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/group/
 eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/group/authority/CdmAuthorityEditorInput.java -text
 eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/group/authority/handler/EditCdmAuthoritiesHandler.java -text
 eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/EditNewTaxonHandler.java -text
-eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/HandlerTools.java -text svneol=unset#text/plain
 eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/OpenChecklistEditorHandler.java -text
 eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/OpenDerivateViewHandler.java -text
 eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/OpenParentHandler.java -text
@@ -625,11 +618,7 @@ eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/v
 eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/validation/ValidationProblemsView.java -text
 eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/validation/ValidatorClassMarkerField.java -text
 eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/validation/ValidatorMessageMarkerField.java -text
-eu.etaxonomy.taxeditor.editor/src/main/resources/AlignmentTestData/JR430_JR-P01.ab1 -text
-eu.etaxonomy.taxeditor.editor/src/main/resources/AlignmentTestData/JR444_JR-P05.ab1 -text
-eu.etaxonomy.taxeditor.editor/src/main/resources/AlignmentTestData/Test_qualityScore.scf -text
 eu.etaxonomy.taxeditor.editor/src/main/resources/TaonDescriptionEditor.screen -text
-eu.etaxonomy.taxeditor.editor/src/main/resources/TestPherogram_qualityScore.scf -text
 eu.etaxonomy.taxeditor.editor/src/main/resources/log4j.properties -text
 eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/Application.java -text
 eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/ApplicationActionBarAdvisor.java -text

diff --git a/eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin_de.properties b/eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin_de.properties
index 8c098c37d1ef2755eed2653be8f0e0114b075ec4..803b460b910b316e22385caaf708145194e9e992 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin_de.properties
+++ b/eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin_de.properties
@@ -139,8 +139,8 @@ marker.field.2 = Attribut
 marker.field.3 = Problematischer Wert
 marker.field.4 = Problembeschreibung
 marker.field.5 = Validierer
-marker.field.6 = Entit�tsklasse
-marker.field.7 = Entit�ts ID
+marker.field.6 = Entit\u00e4tsklasse
+marker.field.7 = Entit\u00e4ts ID
 extension.name.0 = Validierungs-Fehler
 command.label.51 = \u00d6ffne Specimen-Editor
 command.label.52 = L\u00f6schen

diff --git a/eu.etaxonomy.taxeditor.editor/icons/insert-16x16.png b/eu.etaxonomy.taxeditor.editor/icons/insert-16x16.png
deleted file mode 100644 (file)
index 6c9bce7..0000000
Binary files a/eu.etaxonomy.taxeditor.editor/icons/insert-16x16.png and /dev/null differ

diff --git a/eu.etaxonomy.taxeditor.editor/icons/overwrite-16x16.png b/eu.etaxonomy.taxeditor.editor/icons/overwrite-16x16.png
deleted file mode 100644 (file)
index d2aa9e2..0000000
Binary files a/eu.etaxonomy.taxeditor.editor/icons/overwrite-16x16.png and /dev/null differ

diff --git a/eu.etaxonomy.taxeditor.editor/icons/pherogram-insert-left-16x16.png b/eu.etaxonomy.taxeditor.editor/icons/pherogram-insert-left-16x16.png
deleted file mode 100644 (file)
index d36e479..0000000
Binary files a/eu.etaxonomy.taxeditor.editor/icons/pherogram-insert-left-16x16.png and /dev/null differ

diff --git a/eu.etaxonomy.taxeditor.editor/icons/pherogram-insert-left-disabled-16x16.png b/eu.etaxonomy.taxeditor.editor/icons/pherogram-insert-left-disabled-16x16.png
deleted file mode 100644 (file)
index b7a23fa..0000000
Binary files a/eu.etaxonomy.taxeditor.editor/icons/pherogram-insert-left-disabled-16x16.png and /dev/null differ

diff --git a/eu.etaxonomy.taxeditor.editor/icons/pherogram-insert-right-16x16.png b/eu.etaxonomy.taxeditor.editor/icons/pherogram-insert-right-16x16.png
deleted file mode 100644 (file)
index 4d10fb1..0000000
Binary files a/eu.etaxonomy.taxeditor.editor/icons/pherogram-insert-right-16x16.png and /dev/null differ

diff --git a/eu.etaxonomy.taxeditor.editor/icons/pherogram-insert-right-disabled-16x16.png b/eu.etaxonomy.taxeditor.editor/icons/pherogram-insert-right-disabled-16x16.png
deleted file mode 100644 (file)
index 3f9fa7c..0000000
Binary files a/eu.etaxonomy.taxeditor.editor/icons/pherogram-insert-right-disabled-16x16.png and /dev/null differ

diff --git a/eu.etaxonomy.taxeditor.editor/plugin.xml b/eu.etaxonomy.taxeditor.editor/plugin.xml
index 39e3bc0bd874e86e197af33770594bd133e31543..813f665b1b0a517d77d4c79467f64c5e9241292c 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/plugin.xml
+++ b/eu.etaxonomy.taxeditor.editor/plugin.xml
@@ -85,7 +85,6 @@
       </editor>
    </extension>
       <extension
-            id="eu.etaxonomy.taxeditor.editor.molecular.PherogramView"
             point="org.eclipse.ui.views">
          <view
                allowMultiple="false"

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/HandlerTools.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/HandlerTools.java
deleted file mode 100644 (file)
index 31b96f9..0000000
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/HandlerTools.java
+++ /dev/null
@@ -1,40 +0,0 @@
-// $Id$\r
-/**\r
-* Copyright (C) 2015 EDIT\r
-* European Distributed Institute of Taxonomy\r
-* http://www.e-taxonomy.eu\r
-*\r
-* The contents of this file are subject to the Mozilla Public License Version 1.1\r
-* See LICENSE.TXT at the top of this package for the full license terms.\r
-*/\r
-package eu.etaxonomy.taxeditor.editor.handler;\r
-\r
-\r
-import java.net.URL;\r
-\r
-import org.eclipse.core.runtime.FileLocator;\r
-import org.eclipse.core.runtime.Path;\r
-import org.eclipse.jface.resource.ImageDescriptor;\r
-\r
-import eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin;\r
-\r
-\r
-\r
-/**\r
- * Implements shared functionality for handler implementations using tool bar icons.\r
- *\r
- * @author Ben Stöver\r
- * @date 15.06.2015\r
- */\r
-public class HandlerTools {  //TODO Move this class or method somewhere else?\r
-    public static ImageDescriptor createImageDescriptor(String iconName) {\r
-        URL url = FileLocator.find(TaxeditorEditorPlugin.getDefault().getBundle(),\r
-                new Path("icons/" + iconName), null);\r
-        if (url != null) {\r
-            return ImageDescriptor.createFromURL(url);\r
-        }\r
-        else {\r
-            throw new InternalError("Icon \"" + iconName + "\" could not be loaded.");  //TODO Throw other type of exception?\r
-        }\r
-    }\r
-}\r

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/resources/AlignmentTestData/JR430_JR-P01.ab1 b/eu.etaxonomy.taxeditor.editor/src/main/resources/AlignmentTestData/JR430_JR-P01.ab1
deleted file mode 100644 (file)
index 83a3be3..0000000
Binary files a/eu.etaxonomy.taxeditor.editor/src/main/resources/AlignmentTestData/JR430_JR-P01.ab1 and /dev/null differ

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/resources/AlignmentTestData/JR444_JR-P05.ab1 b/eu.etaxonomy.taxeditor.editor/src/main/resources/AlignmentTestData/JR444_JR-P05.ab1
deleted file mode 100644 (file)
index be62c7c..0000000
Binary files a/eu.etaxonomy.taxeditor.editor/src/main/resources/AlignmentTestData/JR444_JR-P05.ab1 and /dev/null differ

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/resources/AlignmentTestData/Test_qualityScore.scf b/eu.etaxonomy.taxeditor.editor/src/main/resources/AlignmentTestData/Test_qualityScore.scf
deleted file mode 100644 (file)
index e680999..0000000
Binary files a/eu.etaxonomy.taxeditor.editor/src/main/resources/AlignmentTestData/Test_qualityScore.scf and /dev/null differ

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/resources/TestPherogram_qualityScore.scf b/eu.etaxonomy.taxeditor.editor/src/main/resources/TestPherogram_qualityScore.scf
deleted file mode 100644 (file)
index e680999..0000000
Binary files a/eu.etaxonomy.taxeditor.editor/src/main/resources/TestPherogram_qualityScore.scf and /dev/null differ