Adjustments to recent architecture changes in TIC and LibrAlign. (TIC top level proje...

The following projects need to be checked out into the workspace from now on:
- https://secure.bioinfweb.info/Code/svn/commons.java/trunk/main
- https://secure.bioinfweb.info/Code/svn/TIC/trunk/main/info.bioinfweb.tic.core
- https://secure.bioinfweb.info/Code/svn/TIC/trunk/main/info.bioinfweb.tic.swt
- https://secure.bioinfweb.info/Code/svn/LibrAlign/trunk/main/info.bioinfweb.libralign.core
- https://secure.bioinfweb.info/Code/svn/LibrAlign/trunk/main/info.bioinfweb.libralign.swt

diff --git a/eu.etaxonomy.taxeditor.editor/.classpath b/eu.etaxonomy.taxeditor.editor/.classpath
index ada5dc9b3c829d3e5c3fce622488b4f5717365d9..727c5b72a23926f59f45060604f859808a8a4ee0 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/.classpath
+++ b/eu.etaxonomy.taxeditor.editor/.classpath
@@ -10,8 +10,11 @@
        <classpathentry exported="true" kind="lib" path="lib/core-1.8.5.jar"/>\r
        <classpathentry exported="true" kind="lib" path="lib/sequencing-1.8.5.jar"/>\r
        <classpathentry exported="true" kind="lib" path="lib/bioinfweb.commons"/>\r
        <classpathentry exported="true" kind="lib" path="lib/core-1.8.5.jar"/>\r
        <classpathentry exported="true" kind="lib" path="lib/sequencing-1.8.5.jar"/>\r
        <classpathentry exported="true" kind="lib" path="lib/bioinfweb.commons"/>\r

-       <classpathentry exported="true" kind="lib" path="lib/LibrAlign" sourcepath="lib/LibrAlign"/>\r

        <classpathentry exported="true" kind="lib" path="lib/commons-lang3-3.1.jar"/>\r
        <classpathentry exported="true" kind="lib" path="lib/JPhyloIO" sourcepath="lib/JPhyloIO"/>\r
        <classpathentry exported="true" kind="lib" path="lib/commons-lang3-3.1.jar"/>\r
        <classpathentry exported="true" kind="lib" path="lib/JPhyloIO" sourcepath="lib/JPhyloIO"/>\r

+       <classpathentry kind="lib" path="lib/info.bioinfweb.libralign.core"/>\r
+       <classpathentry kind="lib" path="lib/info.bioinfweb.libralign.swt"/>\r
+       <classpathentry kind="lib" path="lib/info.bioinfweb.tic.core"/>\r
+       <classpathentry kind="lib" path="lib/info.bioinfweb.tic.swt"/>\r

        <classpathentry kind="output" path="target/classes"/>\r
 </classpath>\r
        <classpathentry kind="output" path="target/classes"/>\r
 </classpath>\r

diff --git a/eu.etaxonomy.taxeditor.editor/.project b/eu.etaxonomy.taxeditor.editor/.project
index ae393bcbdba6fa4f7375b348031c4bf5cb376b60..18951eb2bc5041ef38812afdd9f0aecdfd77c0db 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/.project
+++ b/eu.etaxonomy.taxeditor.editor/.project
@@ -32,14 +32,29 @@
                        <locationURI>WORKSPACE_LOC/JPhyloIO/bin</locationURI>\r
                </link>\r
                <link>\r
                        <locationURI>WORKSPACE_LOC/JPhyloIO/bin</locationURI>\r
                </link>\r
                <link>\r

-                       <name>lib/LibrAlign</name>\r
+                       <name>lib/bioinfweb.commons</name>\r

                        <type>2</type>\r
                        <type>2</type>\r

-                       <locationURI>WORKSPACE_LOC/LibrAlign/bin</locationURI>\r
+                       <locationURI>WORKSPACE_LOC/_Lib/bin</locationURI>\r

                </link>\r
                <link>\r
                </link>\r
                <link>\r

-                       <name>lib/bioinfweb.commons</name>\r
+                       <name>lib/info.bioinfweb.libralign.core</name>\r

                        <type>2</type>\r
                        <type>2</type>\r

-                       <locationURI>WORKSPACE_LOC/_Lib/bin</locationURI>\r
+                       <locationURI>WORKSPACE_LOC/info.bioinfweb.libralign.core/bin</locationURI>\r
+               </link>\r
+               <link>\r
+                       <name>lib/info.bioinfweb.libralign.swt</name>\r
+                       <type>2</type>\r
+                       <locationURI>WORKSPACE_LOC/info.bioinfweb.libralign.swt/bin</locationURI>\r
+               </link>\r
+               <link>\r
+                       <name>lib/info.bioinfweb.tic.core</name>\r
+                       <type>2</type>\r
+                       <locationURI>WORKSPACE_LOC/info.bioinfweb.tic.core/bin</locationURI>\r
+               </link>\r
+               <link>\r
+                       <name>lib/info.bioinfweb.tic.swt</name>\r
+                       <type>2</type>\r
+                       <locationURI>WORKSPACE_LOC/info.bioinfweb.tic.swt/bin</locationURI>\r

                </link>\r
        </linkedResources>\r
 </projectDescription>\r
                </link>\r
        </linkedResources>\r
 </projectDescription>\r

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/molecular/AlignmentEditor.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/molecular/AlignmentEditor.java
index 2ea4df0dbc96f205ac772187fe7c79f6334c3582..4ac7c64190821670a4e13ce31252b9fdf549f03c 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/molecular/AlignmentEditor.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/molecular/AlignmentEditor.java
@@ -36,6 +36,7 @@ import info.bioinfweb.libralign.pherogram.model.ShiftChange;
 import info.bioinfweb.libralign.pherogram.provider.BioJavaPherogramProvider;
 import info.bioinfweb.libralign.pherogram.provider.PherogramProvider;
 import info.bioinfweb.libralign.pherogram.provider.ReverseComplementPherogramProvider;
 import info.bioinfweb.libralign.pherogram.provider.BioJavaPherogramProvider;
 import info.bioinfweb.libralign.pherogram.provider.PherogramProvider;
 import info.bioinfweb.libralign.pherogram.provider.ReverseComplementPherogramProvider;

+import info.bioinfweb.tic.SWTComponentFactory;

 
 import java.io.File;
 import java.io.IOException;
 
 import java.io.File;
 import java.io.IOException;


@@ -302,7 +303,7 @@ public class AlignmentEditor extends EditorPart {
    */
   @Override
   public void createPartControl(Composite parent) {
    */
   @Override
   public void createPartControl(Composite parent) {

-               getAlignmentsContainer().createSWTWidget(parent, SWT.NONE);
+               SWTComponentFactory.getInstance().getSWTComponent(getAlignmentsContainer(), parent, SWT.NONE);

                updateStatusBar();
 
                if (getEditorInput() instanceof AlignmentEditorInput) {
                updateStatusBar();
 
                if (getEditorInput() instanceof AlignmentEditorInput) {

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/molecular/PherogramMouseListener.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/molecular/PherogramMouseListener.java
index b69ea06c36c3f83c45136c981b4f337cef71adbc..5444215437af4571d22c782b10655839b40c0e1e 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/molecular/PherogramMouseListener.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/molecular/PherogramMouseListener.java
@@ -9,9 +9,9 @@
 package eu.etaxonomy.taxeditor.editor.molecular;\r
 \r
 \r
 package eu.etaxonomy.taxeditor.editor.molecular;\r
 \r
 \r

-import info.bioinfweb.commons.tic.input.TICMouseAdapter;\r
-import info.bioinfweb.commons.tic.input.TICMouseEvent;\r

 import info.bioinfweb.libralign.dataarea.implementations.pherogram.PherogramArea;\r
 import info.bioinfweb.libralign.dataarea.implementations.pherogram.PherogramArea;\r

+import info.bioinfweb.tic.input.TICMouseAdapter;\r
+import info.bioinfweb.tic.input.TICMouseEvent;\r

 \r
 import org.eclipse.ui.PartInitException;\r
 \r
 \r
 import org.eclipse.ui.PartInitException;\r
 \r

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/molecular/PherogramViewPart.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/molecular/PherogramViewPart.java
index 752ef9e1d379734f563d19c9e989ba35da0a9c91..9d79e27e92a61e581d171e7fc4fd93b8fc5cab94 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/molecular/PherogramViewPart.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/molecular/PherogramViewPart.java
@@ -12,6 +12,7 @@ package eu.etaxonomy.taxeditor.editor.molecular;
 import info.bioinfweb.libralign.pherogram.PherogramFormats.QualityOutputType;\r
 import info.bioinfweb.libralign.pherogram.model.PherogramComponentModel;\r
 import info.bioinfweb.libralign.pherogram.view.PherogramView;\r
 import info.bioinfweb.libralign.pherogram.PherogramFormats.QualityOutputType;\r
 import info.bioinfweb.libralign.pherogram.model.PherogramComponentModel;\r
 import info.bioinfweb.libralign.pherogram.view.PherogramView;\r

+import info.bioinfweb.tic.SWTComponentFactory;\r

 \r
 import org.eclipse.swt.SWT;\r
 import org.eclipse.swt.widgets.Composite;\r
 \r
 import org.eclipse.swt.SWT;\r
 import org.eclipse.swt.widgets.Composite;\r


@@ -57,7 +58,7 @@ public class PherogramViewPart extends ViewPart {
 \r
        @Override\r
        public void createPartControl(Composite parent) {\r
 \r
        @Override\r
        public void createPartControl(Composite parent) {\r

-               getPherogramView().createSWTWidget(parent, SWT.NONE);\r
+               SWTComponentFactory.getInstance().getSWTComponent(getPherogramView(), parent, SWT.NONE);\r

                getPherogramView().assignSize();\r
        }\r
 \r
                getPherogramView().assignSize();\r
        }\r
 \r