Hello!

To see the file structure, click on "tree".

Note that updates take place every 10 minutes, commits may not be seen immediately.
svn path=/; revision=526
authorpatapanp <patapanp@localhost>
Mon, 10 Feb 2014 21:56:15 +0000 (21:56 +0000)
committerpatapanp <patapanp@localhost>
Mon, 10 Feb 2014 21:56:15 +0000 (21:56 +0000)
Annotation/plugins/swt-3.6.1-win32-win32-x86_64/.classpath [new file with mode: 0644]
Annotation/plugins/swt-3.6.1-win32-win32-x86_64/.project [new file with mode: 0644]
Annotation/plugins/swt-3.6.1-win32-win32-x86_64/about.html [new file with mode: 0644]
Annotation/plugins/swt-3.6.1-win32-win32-x86_64/src.zip [new file with mode: 0644]
Annotation/plugins/swt-3.6.1-win32-win32-x86_64/swt-debug.jar [new file with mode: 0644]
Annotation/plugins/swt-3.6.1-win32-win32-x86_64/swt.jar [new file with mode: 0644]
Annotation/resources/config/application.mac.properties
Annotation/resources/config/application.properties
Annotation/resources/config/curator.properties [new file with mode: 0644]
Annotation/src/ie/dcu/apps/ist/AppWindow.java
Annotation/src/ie/dcu/apps/ist/views/SegmentationView.java

diff --git a/Annotation/plugins/swt-3.6.1-win32-win32-x86_64/.classpath b/Annotation/plugins/swt-3.6.1-win32-win32-x86_64/.classpath
new file mode 100644 (file)
index 0000000..e1225d4
--- /dev/null
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+       <classpathentry kind="src" path=""/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+       <classpathentry exported="true" sourcepath="src.zip" kind="lib" path="swt.jar">
+               <attributes>
+                       <attribute value="http://help.eclipse.org/stable/nftopic/org.eclipse.platform.doc.isv/reference/api/" name="javadoc_location"/>
+                       <attribute value="org.eclipse.swt" name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY"/>
+               </attributes>
+       </classpathentry>
+       <classpathentry kind="output" path=""/>
+</classpath>
diff --git a/Annotation/plugins/swt-3.6.1-win32-win32-x86_64/.project b/Annotation/plugins/swt-3.6.1-win32-win32-x86_64/.project
new file mode 100644 (file)
index 0000000..961502f
--- /dev/null
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+       <name>org.eclipse.swt</name>
+       <comment></comment>
+       <projects>
+       </projects>
+       <buildSpec>
+               <buildCommand>
+                       <name>org.eclipse.jdt.core.javabuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+       </buildSpec>
+       <natures>
+               <nature>org.eclipse.jdt.core.javanature</nature>
+       </natures>
+</projectDescription>
\ No newline at end of file
diff --git a/Annotation/plugins/swt-3.6.1-win32-win32-x86_64/about.html b/Annotation/plugins/swt-3.6.1-win32-win32-x86_64/about.html
new file mode 100644 (file)
index 0000000..7a5cfd1
--- /dev/null
@@ -0,0 +1,171 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+<p>August 17, 2006</p> 
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+
+<h3>Third Party Content</h3>
+
+<p>The Content includes items that have been sourced from third parties as set out below. If you 
+did not receive this Content directly from the Eclipse Foundation, the following is provided 
+for informational purposes only, and you should look to the Redistributor&rsquo;s license for 
+terms and conditions of use.</p>
+
+<h4>Mozilla Binding</h4>
+
+<p>The &quot;Mozilla Binding&quot; is a binding to the Mozilla API.  The Content may include any or all of the following files:</p>
+
+<p>The following files in the plug-in JAR shall be defined as the native code portion of the Mozilla Binding:</p>
+<ul>
+       <li>swt-xulrunner-win32-xxxx.so (where &quot;xxxx&quot; is the version number)</li>
+       <li>swt-xpcominit-win32-xxxx.so (where &quot;xxxx&quot; is the version number)</li>
+</ul>
+
+<p>The following files in both the plug-in JAR and the src.zip shall be defined respectively as the bytecode and source code portions of the Mozilla Binding:</p>
+<ul>
+       <li>The contents of the directory org/eclipse/swt/internal/mozilla (but not including any sub-directories)</li>
+</ul>
+
+<p>The Mozilla Binding contains portions of Mozilla (&quot;Mozilla&quot;).  Mozilla is made available by Mozilla.org.  Use of Mozilla is governed by the terms and
+conditions of the Mozilla Public License Version 1.1 (&quot;MPL&quot;).  A copy of the MPL is provided with the Content (<a href="about_files/mpl-v11.txt" target="_blank">mpl-v11.txt</a>) and is also available at
+<a href="http://www.mozilla.org/MPL/MPL-1.1.html" target="_blank">http://www.mozilla.org/MPL/MPL-1.1.html</a>.</p>
+
+<h4>Independent JPEG Group's JPEG software release 6b</h4>
+
+<p>This software is based in part on the work of the Independent JPEG Group's JPEG software release 6b (&quot;LIBJPEG&quot;).
+LIBJPEG was used to implement the decoding of JPEG format files in Java (TM).  The Content does NOT include any portion of the LIBJPEG file ansi2knr.c.</p>
+
+<p>Your use of LIBJPEG is subject to the terms and conditions located in the <a href="about_files/IJG_README">about_files/IJG_README</a> file which is included
+with the Content.</p>
+
+<p>The IJG's website is located at <a href="http://ijg.org/" target="_blank">http://ijg.org</a>.</p>
+
+<p>The class org.eclipse.swt.internal.image.JPEGFileFormat is based on following files from LIBJPEG:</p>
+
+<ul>
+    <li>cderror.h</li>
+    <li>cdjpeg.h</li>
+    <li>jchuff.h</li>
+    <li>jdcolor.c</li>
+    <li>jdct.h</li>
+    <li>jdhuff.h</li>
+    <li>jerror.h</li>
+    <li>jidctint.c</li>
+    <li>jinclude.h</li>
+    <li>jmemsys.h</li>
+    <li>jmorecfg.h</li>
+    <li>jpegint.h</li>
+    <li>jpeglib.h</li>
+    <li>jversion.h</li>
+    <li>transupp.h</li>
+</ul>
+
+<p>The class org.eclipse.swt.internal.image.JPEGDecoder is based on the following files from LIBJPEG:</p>
+
+<ul>
+       <li>jcapimin.c</li>
+       <li>jcapistd.c</li>
+       <li>jccoefct.c</li>
+       <li>jccolor.c</li>
+       <li>jcdctmgr.c</li>
+       <li>jchuff.c</li>
+       <li>jcinit.c</li>
+       <li>jcmainct.c</li>
+       <li>jcmarker.c</li>
+       <li>jcmaster.c</li>
+       <li>jcomapi.c</li>
+       <li>jcparam.c</li>
+       <li>jcphuff.c</li>
+       <li>jcprepct.c</li>
+       <li>jcsample.c</li>
+       <li>jctrans.c</li>
+       <li>jdapimin.c</li>
+       <li>jdapistd.c</li>
+       <li>jdatadst.c</li>
+       <li>jdatasrc.c</li>
+       <li>jdcoefct.c</li>
+       <li>jdcolor.c</li>
+       <li>jddctmgr.c</li>
+       <li>jdhuff.c</li>
+       <li>jdinput.c</li>
+       <li>jdmainct.c</li>
+       <li>jdmarker.c</li>
+       <li>jdmaster.c</li>
+       <li>jdmerge.c</li>
+       <li>jdphuff.c</li>
+       <li>jdpostct.c</li>
+       <li>jdsample.c</li>
+       <li>jdtrans.c</li>
+       <li>jerror.c</li>
+       <li>jfdctflt.c</li>
+       <li>jfdctfst.c</li>
+       <li>jfdctint.c</li>
+       <li>jidctflt.c</li>
+       <li>jidctfst.c</li>
+       <li>jidctint.c</li>
+       <li>jidctred.c</li>
+       <li>jpegtran.c</li>
+       <li>jquant1.c</li>
+       <li>jquant2.c</li>
+       <li>jutils.c</li>
+       <li>cderror.h</li>
+       <li>cdjpeg.h</li>
+       <li>jchuff.h</li>
+       <li>jconfig.h</li>
+       <li>jdct.h</li>
+       <li>jdhuff.h</li>
+       <li>jerror.h</li>
+       <li>jinclude.h</li>
+       <li>jmorecfg.h</li>
+       <li>jpegint.h</li>
+       <li>jpeglib.h</li>
+       <li>jversion.h</li>
+       <li>transupp.h</li>
+</ul>
+       
+<p>The following changes were made to the LIBJPEG code in the Content:</p>
+
+<ol>
+       <li>In Java, pointer math is not allowed so indexing was used instead.</li>
+       <li>Function pointers were replaced with switch statements.</li>
+       <li>The virtual memory, tracing and progress monitoring were removed.</li>
+       <li>The error handling was simplified and now uses Java exceptions.</li>
+</ol>
+
+<h4>PuTTY 0.58 (derivative work)</h4>
+
+<p>Portions of the SWT class org/eclipse/swt/internal/image/PngDeflater are based on PuTTY's sshzlib.c. PuTTY is made available by Mozilla.org.  Use of PuTTY is governed by the terms and
+conditions of the the following MIT-style license:  </p>
+<blockquote>
+  <p><em>PuTTY is copyright 1997-2007 Simon Tatham.</em> </p>
+  <p><em>Portions copyright Robert de Bath, Joris van Rantwijk, Delian  Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas Barry,  Justin Bradford, Ben Harris, Malcolm Smith, Ahmad Khalifa, Markus Kuhn,  and CORE SDI S.A.</em> </p>
+  <p><em>Permission is hereby granted, free of charge, to any person  obtaining a copy of this software and associated documentation files  (the &quot;Software&quot;), to deal in the Software without restriction,  including without limitation the rights to use, copy, modify, merge,  publish, distribute, sublicense, and/or sell copies of the Software,  and to permit persons to whom the Software is furnished to do so,  subject to the following conditions:</em> </p>
+  <p><em>The above copyright notice and this permission notice shall be  included in all copies or substantial portions of the Software.</em> </p>
+  <p><em>THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND,  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND  NONINFRINGEMENT.  IN NO EVENT SHALL SIMON TATHAM BE LIABLE FOR ANY  CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE  SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</em> </p>
+</blockquote>
+<p>A copy of the license is also available at <a href="http://www.chiark.greenend.org.uk/~sgtatham/putty/licence.html" target="_blank">http://www.chiark.greenend.org.uk/~sgtatham/putty/licence.html</a>.</p>
+
+<p><small>Java and all Java-based trademarks and logos are trademarks or registered trademarks of Sun Microsystems, Inc. in the United States and other countries.</small></p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/Annotation/plugins/swt-3.6.1-win32-win32-x86_64/src.zip b/Annotation/plugins/swt-3.6.1-win32-win32-x86_64/src.zip
new file mode 100644 (file)
index 0000000..a05a5b1
Binary files /dev/null and b/Annotation/plugins/swt-3.6.1-win32-win32-x86_64/src.zip differ
diff --git a/Annotation/plugins/swt-3.6.1-win32-win32-x86_64/swt-debug.jar b/Annotation/plugins/swt-3.6.1-win32-win32-x86_64/swt-debug.jar
new file mode 100644 (file)
index 0000000..a1deaf7
Binary files /dev/null and b/Annotation/plugins/swt-3.6.1-win32-win32-x86_64/swt-debug.jar differ
diff --git a/Annotation/plugins/swt-3.6.1-win32-win32-x86_64/swt.jar b/Annotation/plugins/swt-3.6.1-win32-win32-x86_64/swt.jar
new file mode 100644 (file)
index 0000000..1312014
Binary files /dev/null and b/Annotation/plugins/swt-3.6.1-win32-win32-x86_64/swt.jar differ
index b4ddf8a15b4e3dfbfa56f678c00510bee4e06223..e933e3210e391a54be3a2a8d2f6e5cf4234f8ef6 100644 (file)
@@ -38,4 +38,4 @@ POWebService.TermDetail.URL=http://palea.cgrb.oregonstate.edu/services/PO_web_se
 UbioWebService.SpeciesTermSearch.URL=http://www.ubio.org/webservices/service.php?function=namebank_search&searchName=<search_term>&sci=1&vern=0&keyCode=9c5ed3537fb089c0467c42c4d70b3dee71cbf3cd
 
 #Curators names
-CuratorNamesList=Nikhil Lingutla,Justin Preece,Pankaj Jaiswal,Laurel Cooper,Rajani Raja
\ No newline at end of file
+#CuratorNamesList1=Nikhil Lingutla,Justin Preece,Pankaj Jaiswal,Laurel Cooper,Rajani Raja,Panini
\ No newline at end of file
index a5cde027f920853b4bb5a7ea90b75163fb6f91cd..0d5e249c09a9414db23630bf15806078f84969a4 100644 (file)
@@ -42,5 +42,3 @@ POWebService.TermDetail.URL=http://palea.cgrb.oregonstate.edu/services/PO_web_se
 # UBio Web Service Configuration
 UbioWebService.SpeciesTermSearch.URL=http://www.ubio.org/webservices/service.php?function=namebank_search&searchName=<search_term>&sci=1&vern=0&keyCode=9c5ed3537fb089c0467c42c4d70b3dee71cbf3cd
 
-#Curators names
-CuratorNamesList=Nikhil Lingutla,Justin Preece,Pankaj Jaiswal,Laurel Cooper,Rajani Raja
\ No newline at end of file
diff --git a/Annotation/resources/config/curator.properties b/Annotation/resources/config/curator.properties
new file mode 100644 (file)
index 0000000..3f786eb
--- /dev/null
@@ -0,0 +1,3 @@
+\r
+#Curators names\r
+CuratorNamesList1=Nikhil Lingutla,Justin Preece,Pankaj Jaiswal,Laurel Cooper,Rajani Raja,Panini
\ No newline at end of file
index 49a5051cd21373c5fca7f2a192339b84f00ab798..2cc37f99df30a045e71c6ae138191e3bc04434a2 100644 (file)
@@ -34,6 +34,7 @@ public class AppWindow extends ApplicationWindow implements FileDropListener {
        private static final Logger log = Logger.getLogger("AppWindow");
        
        public static Properties props;
+       public static Properties curatornames;
 
        private AppPrefsManager prefsManager;
        private ActionManager actions;
@@ -50,6 +51,7 @@ public class AppWindow extends ApplicationWindow implements FileDropListener {
                super(null);
 
                props = loadProperties();
+               curatornames =loadCuratorNames();
 
                addMenuBar();
                addStatusLine();
@@ -73,10 +75,21 @@ public class AppWindow extends ApplicationWindow implements FileDropListener {
                        throw new RuntimeException(e);
                }
        }
+       private Properties loadCuratorNames() {
+               try {
+                       return Application.loadProperties(getCuratorNames());
+               } catch (IOException e) {
+                       log.severe("Unable to load properties file " + e.getMessage());
+                       throw new RuntimeException(e);
+               }
+       }
        
        private String getPropertiesFile() {
                return OsUtils.isMacOS() ? "application.mac" : "application";
        }
+       private String getCuratorNames() {
+               return "curator";
+       }
 
 
        public void updateWindowTitle() {
@@ -109,7 +122,7 @@ public class AppWindow extends ApplicationWindow implements FileDropListener {
                }
 
                // Create view
-               SegmentationView view = new SegmentationView(props, parent, 0);
+               SegmentationView view = new SegmentationView(props,curatornames, parent, 0);
 
                boolean blocksOnFork = false;
                
index aed5dd3c46176f474017017fcf307508815e8450..eb23ba9b366afec6d38b597191563e4b76413cd1 100644 (file)
@@ -12,7 +12,6 @@ import ie.dcu.segment.options.SegmenterOptionDialog;
 import ie.dcu.segment.painters.SegmentationPainter;
 import ie.dcu.swt.*;
 import ie.dcu.swt.event.*;
-//import ie.dcu.apps.ist.activelearning.*;
 
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
@@ -31,6 +30,8 @@ import org.eclipse.jface.operation.*;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.*;
+import org.eclipse.swt.graphics.FontMetrics;
+import org.eclipse.swt.graphics.GC;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.layout.*;
 import org.eclipse.swt.widgets.*;
@@ -44,7 +45,7 @@ public class SegmentationView extends Composite {
        
        // Segmentation view properties
        private final Properties props;
-       
+       private final Properties curatornames;
        
        // Houses various painters
        private final PainterRegistry painters;
@@ -88,6 +89,7 @@ public class SegmentationView extends Composite {
        
        private static Button assign,searchSpecies;
        
+       
        public static Text collectionId, comment;
        
        // Current segmentation tool
@@ -151,10 +153,10 @@ public class SegmentationView extends Composite {
     };
 
        // constructor
-       public SegmentationView(Properties props, Composite parent, int style) {
+       public SegmentationView(Properties props,Properties curatornames,Composite parent, int style) {
                super(parent, style);
                this.props = props;
-               
+               this.curatornames = curatornames;
                painters = new PainterRegistry();
                mainToolbar = new ToolBar(this, SWT.RIGHT | SWT.FLAT);
                viewSelectionToolbar = new ToolBar(this, SWT.RIGHT | SWT.FLAT);
@@ -259,12 +261,13 @@ public class SegmentationView extends Composite {
        public void resetView() {
                Tool.LabelMode.action.setChecked(false);
                resetViewSelectionToolbar(painters.get("Segmented"));
-               //panini
+               
                // clear metadata
                comboLabel.removeAll();
                comboLabel.setEnabled(false);
                clearTermDetailTable();
                clearTermSynonymTable();
+               //collectionID.setLayoutData();
                collectionId.setText("");
                comment.setText("");
                curatorCombo.deselectAll();
@@ -531,7 +534,7 @@ public class SegmentationView extends Composite {
                
                // Combo box and label for species
                SwtUtils.addLabelToComposite(termDetailComposite, getAction(Tool.SetSpecies).getText());
-               speciesCombo = SwtUtils.addComboToComposite(termDetailComposite, 250, SWT.READ_ONLY);
+               speciesCombo = SwtUtils.addComboToComposite(termDetailComposite, 150, SWT.READ_ONLY);
                speciesCombo.setToolTipText( getAction(Tool.SetSpecies).getToolTipText());
                
                searchSpecies = SwtUtils.addButtonToComposite(termDetailComposite, 75, "Search");
@@ -544,25 +547,32 @@ public class SegmentationView extends Composite {
                
                // Combo box and label for curator
                SwtUtils.addLabelToComposite(termDetailComposite, getAction(Tool.SetCurator).getText());
-               curatorCombo = SwtUtils.addComboToComposite(termDetailComposite, 250, SWT.READ_ONLY);
+               curatorCombo = SwtUtils.addComboToComposite(termDetailComposite, 150, SWT.READ_ONLY);
                curatorCombo.setToolTipText( getAction(Tool.SetCurator).getToolTipText());
                curatorCombo.addSelectionListener(new SelectionAdapter() {
                        public void widgetSelected(SelectionEvent e) {
                                execute(Tool.SetPainter, null);
                        }
                });
-               String[] curatorsList = AppWindow.props.getProperty("CuratorNamesList").split(",");
+               String[] curatorsList = AppWindow.curatornames.getProperty("CuratorNamesList1").split(",");
                for(String curator : curatorsList)
                        curatorCombo.add(curator);
                
                // text field for collection Id
                SwtUtils.addLabelToComposite(termDetailComposite, "Collection Id");
                collectionId = SwtUtils.addTextFieldToComposite(termDetailComposite);
+               //collectionId = new Text(termDetailComposite,250);
                //collectionId.setToolTipText( getAction(Tool.SetPainter).getToolTipText());
-               
+               //GC gc = new GC (collectionId);
+               //FontMetrics fm = gc.getFontMetrics ();
+               //int width = 250*fm.getAverageCharWidth ();
+               //int height = fm.getHeight ();
+               //gc.dispose ();
+               //collectionId.setSize (collectionId.computeSize (400, 1));
                // Comments Text Area
                SwtUtils.addLabelToComposite(termDetailComposite, "Comments");
                comment = SwtUtils.addTextAreaToComposite(termDetailComposite);
+               //comment=new Text(termDetailComposite,SWT.MULTI);
                //comment.setToolTipText( getAction(Tool.SetPainter).getToolTipText());
        }
        
@@ -669,17 +679,35 @@ public class SegmentationView extends Composite {
                
                // Layout collection id box                             
                gd = new GridData();
-               gd.widthHint = width;
+               gd.widthHint = width+50;
                gd.grabExcessHorizontalSpace = true;
                gd.grabExcessVerticalSpace = true;
+               
+               collectionId.setText("");
                collectionId.setLayoutData(gd);
                
+               
                // Layout comments box                          
                gd = new GridData();
-               gd.widthHint = width;
+               gd.widthHint = heightHint;
+               gd.heightHint= heightHint;
                gd.grabExcessHorizontalSpace = true;
                gd.grabExcessVerticalSpace = true;
-               gd.verticalAlignment = SWT.FILL;
+               gd.verticalAlignment = GridData.FILL;
+               gd.horizontalAlignment=GridData.FILL;
+               gd.grabExcessVerticalSpace = true;
+               gd.grabExcessHorizontalSpace = true;
+               gd.minimumWidth = width;
+               gd.verticalSpan=width;
+               gd.horizontalSpan= width;
+               comment.setText("");
+               //comment.getBounds();
+               comment.getHorizontalBar();
+               comment.getLineDelimiter();
+               comment.getVerticalBar();
+               comment.setSize(width, heightHint);
+               
+               //comment.computeSize(heightHint, width);
                comment.setLayoutData(gd);
        }
        
@@ -1222,7 +1250,7 @@ public class SegmentationView extends Composite {
        */
        private void assignLabel() {
                SegmentationPainter painter = painters.get("Segmented");
-               //panini
+               
                setPainter(painter);
        }