You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by pk...@apache.org on 2016/03/13 13:32:54 UTC

svn commit: r1734797 - in /uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/text/completion: RutaCompletionProposalCollector.java RutaNoTypeCompletionProposalComputer.java RutaTypeCompletionProposalComputer.java

Author: pkluegl
Date: Sun Mar 13 12:32:54 2016
New Revision: 1734797

URL: http://svn.apache.org/viewvc?rev=1734797&view=rev
Log:
UIMA-4839
- delegate with displayName

Modified:
    uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/text/completion/RutaCompletionProposalCollector.java
    uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/text/completion/RutaNoTypeCompletionProposalComputer.java
    uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/text/completion/RutaTypeCompletionProposalComputer.java

Modified: uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/text/completion/RutaCompletionProposalCollector.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/text/completion/RutaCompletionProposalCollector.java?rev=1734797&r1=1734796&r2=1734797&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/text/completion/RutaCompletionProposalCollector.java (original)
+++ uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/text/completion/RutaCompletionProposalCollector.java Sun Mar 13 12:32:54 2016
@@ -45,7 +45,7 @@ public class RutaCompletionProposalColle
   @Override
   protected ScriptCompletionProposal createScriptCompletionProposal(String completion,
           int replaceStart, int length, Image image, String displayString, int i) {
-    return new RutaScriptCompletionProposal(completion, replaceStart, length, image, null, i);
+    return new RutaScriptCompletionProposal(completion, replaceStart, length, image, displayString, i);
   }
 
   @Override

Modified: uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/text/completion/RutaNoTypeCompletionProposalComputer.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/text/completion/RutaNoTypeCompletionProposalComputer.java?rev=1734797&r1=1734796&r2=1734797&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/text/completion/RutaNoTypeCompletionProposalComputer.java (original)
+++ uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/text/completion/RutaNoTypeCompletionProposalComputer.java Sun Mar 13 12:32:54 2016
@@ -19,13 +19,11 @@
 
 package org.apache.uima.ruta.ide.ui.text.completion;
 
-import org.apache.uima.ruta.ide.RutaIdeUIPlugin;
 import org.apache.uima.ruta.ide.ui.templates.RutaTemplateCompletionProcessor;
 import org.eclipse.dltk.core.CompletionProposal;
 import org.eclipse.dltk.ui.text.completion.ScriptCompletionProposalCollector;
 import org.eclipse.dltk.ui.text.completion.ScriptCompletionProposalComputer;
 import org.eclipse.dltk.ui.text.completion.ScriptContentAssistInvocationContext;
-import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.text.templates.TemplateCompletionProcessor;
 
 public class RutaNoTypeCompletionProposalComputer extends ScriptCompletionProposalComputer {
@@ -49,7 +47,7 @@ public class RutaNoTypeCompletionProposa
 
     // collector.setIgnored(CompletionProposal.TYPE_REF, true);
     collector.setIgnored(CompletionProposal.TYPE_REF, false);
-    IPreferenceStore preferenceStore = RutaIdeUIPlugin.getDefault().getPreferenceStore();
+//    IPreferenceStore preferenceStore = RutaIdeUIPlugin.getDefault().getPreferenceStore();
 
     return collector;
   }

Modified: uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/text/completion/RutaTypeCompletionProposalComputer.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/text/completion/RutaTypeCompletionProposalComputer.java?rev=1734797&r1=1734796&r2=1734797&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/text/completion/RutaTypeCompletionProposalComputer.java (original)
+++ uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/ui/text/completion/RutaTypeCompletionProposalComputer.java Sun Mar 13 12:32:54 2016
@@ -19,13 +19,11 @@
 
 package org.apache.uima.ruta.ide.ui.text.completion;
 
-import org.apache.uima.ruta.ide.RutaIdeUIPlugin;
 import org.apache.uima.ruta.ide.ui.templates.RutaTemplateCompletionProcessor;
 import org.eclipse.dltk.core.CompletionProposal;
 import org.eclipse.dltk.ui.text.completion.ScriptCompletionProposalCollector;
 import org.eclipse.dltk.ui.text.completion.ScriptCompletionProposalComputer;
 import org.eclipse.dltk.ui.text.completion.ScriptContentAssistInvocationContext;
-import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.text.templates.TemplateCompletionProcessor;
 
 public class RutaTypeCompletionProposalComputer extends ScriptCompletionProposalComputer {
@@ -48,7 +46,7 @@ public class RutaTypeCompletionProposalC
 
     collector.setIgnored(CompletionProposal.TYPE_REF, false);
 
-    IPreferenceStore preferenceStore = RutaIdeUIPlugin.getDefault().getPreferenceStore();
+//    IPreferenceStore preferenceStore = RutaIdeUIPlugin.getDefault().getPreferenceStore();
 
     return collector;
   }