Revision: 19685
          http://sourceforge.net/p/gate/code/19685
Author:   markagreenwood
Date:     2016-10-16 16:47:02 +0000 (Sun, 16 Oct 2016)
Log Message:
-----------
pulled in changes from trunk

Modified Paths:
--------------
    
gate/branches/sawdust2/gate-core/src/main/java/gate/gui/DocumentExportMenu.java
    
gate/branches/sawdust2/gate-core/src/main/java/gate/gui/LuceneDataStoreSearchGUI.java
    gate/branches/sawdust2/gate-core/src/main/java/gate/gui/MainFrame.java

Property Changed:
----------------
    gate/branches/sawdust2/gate-core/src/main/java/gate/gui/

Index: gate/branches/sawdust2/gate-core/src/main/java/gate/gui
===================================================================
--- gate/branches/sawdust2/gate-core/src/main/java/gate/gui     2016-10-16 
01:22:35 UTC (rev 19684)
+++ gate/branches/sawdust2/gate-core/src/main/java/gate/gui     2016-10-16 
16:47:02 UTC (rev 19685)

Property changes on: gate/branches/sawdust2/gate-core/src/main/java/gate/gui
___________________________________________________________________
Modified: svn:mergeinfo
## -4,4 +4,4 ##
 /gate/branches/release-8.1/src/main/gate/gui:18736-18747
 /gate/branches/sawdust/src/main/gate/gui:17055-17079
 /gate/tags/release-7.0/src/main/gate/gui:15399-15407
-/gate/trunk/src/main/gate/gui:3-7,19180-19295
+/gate/trunk/src/main/gate/gui:3-7,19180-19684
\ No newline at end of property
Modified: 
gate/branches/sawdust2/gate-core/src/main/java/gate/gui/DocumentExportMenu.java
===================================================================
--- 
gate/branches/sawdust2/gate-core/src/main/java/gate/gui/DocumentExportMenu.java 
    2016-10-16 01:22:35 UTC (rev 19684)
+++ 
gate/branches/sawdust2/gate-core/src/main/java/gate/gui/DocumentExportMenu.java 
    2016-10-16 16:47:02 UTC (rev 19685)
@@ -314,7 +314,11 @@
                             if(fileName.toLowerCase().endsWith(
                                     "." + de.getDefaultExtension())) {
                               fileName =
-                                      fileName.substring(0, fileName.length() 
- 5);
+                                      fileName.substring(0,
+                                              fileName.length()
+                                                      - 
de.getDefaultExtension()
+                                                              .length()
+                                                      + 1);
                             }
                             if(usedFileNames.contains(fileName)) {
                               // name clash -> add unique ID

Modified: 
gate/branches/sawdust2/gate-core/src/main/java/gate/gui/LuceneDataStoreSearchGUI.java
===================================================================
--- 
gate/branches/sawdust2/gate-core/src/main/java/gate/gui/LuceneDataStoreSearchGUI.java
       2016-10-16 01:22:35 UTC (rev 19684)
+++ 
gate/branches/sawdust2/gate-core/src/main/java/gate/gui/LuceneDataStoreSearchGUI.java
       2016-10-16 16:47:02 UTC (rev 19685)
@@ -3118,6 +3118,9 @@
     public Component getTableCellRendererComponent(JTable table, Object value,
             boolean isSelected, boolean hasFocus, int row, int column) {
       String text = (String)value;
+      if(text == null) {
+        text = "";
+      }
       int colModel = resultTable.convertColumnIndexToModel(column);
       // cut text in the middle if too long
       switch(colModel) {

Modified: gate/branches/sawdust2/gate-core/src/main/java/gate/gui/MainFrame.java
===================================================================
--- gate/branches/sawdust2/gate-core/src/main/java/gate/gui/MainFrame.java      
2016-10-16 01:22:35 UTC (rev 19684)
+++ gate/branches/sawdust2/gate-core/src/main/java/gate/gui/MainFrame.java      
2016-10-16 16:47:02 UTC (rev 19685)
@@ -2925,8 +2925,8 @@
             long startTime = System.currentTimeMillis();
 
             // load LingPipe as an application from a gapp file
-            Controller controller =
-                (Controller)PersistenceManager.loadObjectFromUrl(pipelineURL);
+            Resource controller =
+                (Resource)PersistenceManager.loadObjectFromUrl(pipelineURL);
 
             if(!icon.equals(controller.getFeatures().get("gate.gui.icon"))) {
               

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.


------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most 
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
_______________________________________________
GATE-cvs mailing list
GATE-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/gate-cvs

Reply via email to