Changeset 1219

Show
Ignore:
Timestamp:
07/07/08 14:32:08 (2 months ago)
Author:
phoenix
Message:

Major changes: updated Mmrnmhrm to DLTK 0.95 and Eclipse 3.4
Minor fixes.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/mmrnmhrm.ui/.classpath

    r749 r1219  
    11<?xml version="1.0" encoding="UTF-8"?> 
    22<classpath> 
     3    <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> 
     4    <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> 
    35    <classpathentry kind="src" path="src"/> 
    46    <classpathentry kind="src" path="src-jdt-adapters"/> 
    57    <classpathentry kind="src" path="src-jdt-original"/> 
    68    <classpathentry kind="src" path="src-dltk-branch"/> 
    7     <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> 
    8     <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> 
    99    <classpathentry kind="output" path="bin"/> 
    1010</classpath> 

  • trunk/mmrnmhrm.ui/META-INF/MANIFEST.MF

    r906 r1219  
    99 org.eclipse.core.resources, 
    1010 org.eclipse.core.expressions, 
     11 org.eclipse.core.filesystem, 
     12 org.eclipse.core.runtime, 
    1113 com.ibm.icu, 
    12  org.eclipse.core.runtime, 
    1314 org.eclipse.jface.text, 
    1415 org.eclipse.dltk.core, 
     16 org.eclipse.dltk.ui, 
     17 org.eclipse.dltk.debug, 
    1518 org.eclipse.dltk.debug.ui, 
    16  org.eclipse.dltk.ui, 
    1719 org.eclipse.dltk.launching, 
    1820 org.eclipse.ui, 
    …… 
    2224 org.eclipse.ui.ide, 
    2325 org.eclipse.ui.navigator, 
     26 org.eclipse.ui.console, 
    2427 org.eclipse.search, 
    25  org.eclipse.core.filesystem, 
    26  org.eclipse.ui.console, 
    27  org.eclipse.debug.ui, 
    28  org.eclipse.dltk.debug 
     28 org.eclipse.debug.ui 
    2929Eclipse-LazyStart: true 
    3030Bundle-Vendor: %pluginProvider 

  • trunk/mmrnmhrm.ui/plugin.xml

    r906 r1219  
    88    <language 
    99          class="mmrnmhrm.ui.DeeUILanguageToolkit" 
    10           nature="mmrnmhrm.core.deenature" 
     10          nature="mmrnmhrm.core.nature" 
    1111          priority="0"/> 
    1212 </extension> 
    …… 
    3838            icon="icons/ovr16/d-dark_ovr.gif" 
    3939            id="mmrnmhrm.ui.deeProjectNatureImage" 
    40             natureId="mmrnmhrm.core.deenature"/> 
     40            natureId="mmrnmhrm.core.nature"/> 
    4141   </extension> 
    4242   <extension 
    …… 
    9191              category="mmrnmhrm.ui.preferences.Editor" 
    9292              class="mmrnmhrm.ui.preferences.pages.DeeSourceColoringPreferencePage" 
    93               id="mmrnmhrm.ui.preferences.Editor" 
     93              id="mmrnmhrm.ui.preferences.editor.SourceColoring" 
    9494              name="%LangEditorSyntaxColoringPreferencePage.name"/> 
    9595        <page 
    9696              category="mmrnmhrm.ui.preferences.Editor" 
    9797              class="mmrnmhrm.ui.preferences.pages.DeeTemplatePreferencePage" 
    98               id="mmrnmhrm.ui.preferences.Editor" 
     98              id="mmrnmhrm.ui.preferences.editor.CodeTemplates" 
    9999              name="%LangCodeTemplatesPreferencePage.name">       
    100100             
    …… 
    103103            category="mmrnmhrm.ui.preferences.DeeRootPreferencePage" 
    104104            class="mmrnmhrm.ui.preferences.pages.DeeCompilersPreferencePage" 
    105             id="mmrnmhrm.ui.preferences.editor.SourceColoring" 
     105            id="mmrnmhrm.ui.preferences.DeeCompilers" 
    106106            name="%LangCompilersPreferencePage.name"> 
    107107      </page> 
    …… 
    186186          name="%LangTemplateContext.name"> 
    187187    </contextType> 
     188    <include 
     189          file="default-templates.xml" 
     190          translations="default-templates.properties"> 
     191    </include> 
    188192    <!--<include 
    189193          file="templates/templates.xml" 
    …… 
    570574            id="mmrnmrhm.core.launching.INTERPRETER_CONTAINER" 
    571575            name="D System Libraries" 
    572             nature="mmrnmhrm.core.deenature"> 
     576            nature="mmrnmhrm.core.nature"> 
    573577      </buildpathContainerPath> 
    574578   </extension> 
    …… 
    605609                <iterate> 
    606610                  <!-- 
    607                   <test args="mmrnmhrm.core.deenature" 
     611                  <test args="mmrnmhrm.core.nature" 
    608612                    property="org.eclipse.dltk.launching.hasProjectNature"> 
    609613                  </test> 
    …… 
    615619                    <adapt type="org.eclipse.core.resources.IProject"> 
    616620                      <test property="org.eclipse.core.resources.projectNature" 
    617                         value="mmrnmhrm.core.deenature"/> 
     621                        value="mmrnmhrm.core.nature"/> 
    618622                    </adapt> 
    619623                  </or> 
    …… 
    729733      <debugModel 
    730734            debugModelId="descent.debug.core.model" 
    731             natureId="mmrnmhrm.core.deenature" 
     735            natureId="mmrnmhrm.core.nature" 
    732736            typeFactory="mmrnmhrm.ui.launch.RubyTypeFactory"> 
    733737      </debugModel> 
    734738    </extension> 
     739 <extension 
     740       point="org.eclipse.dltk.ui.scriptDocumentationProviders"> 
     741    <provider 
     742          class="mmrnmhrm.ui.editor.doc.DeeDocumentationProvider" 
     743          id="mmrnmhrm.ui.DeeDocumentationProvider" 
     744          nature="mmrnmhrm.core.nature"> 
     745    </provider> 
     746 </extension> 
    735747    
    736748 

  • trunk/mmrnmhrm.ui/src/melnorme/lang/ui/EditorUtil.java

    r758 r1219  
    33 
    44 
    5 import static melnorme.miscutil.Assert.assertNotNull; 
    6 import mmrnmhrm.core.dltk.DeeModuleDeclaration; 
    7 import mmrnmhrm.core.dltk.ParsingUtil; 
     5import mmrnmhrm.core.dltk.DeeParserUtil; 
    86import mmrnmhrm.ui.ActualPlugin; 
    97 
    …… 
    103101            return null; 
    104102        ISourceModule modUnit = (ISourceModule) element; 
    105         DeeModuleDeclaration modDec = ParsingUtil.parseModule(modUnit); 
    106         Module neoModule = ParsingUtil.getNeoASTModule(modDec); 
    107         assertNotNull(neoModule.getModuleUnit()); 
     103        Module neoModule = DeeParserUtil.getNeoASTModule(modUnit); 
     104        //assertNotNull(neoModule.getModuleUnit()); 
    108105        return neoModule; 
    109106    } 

  • trunk/mmrnmhrm.ui/src/mmrnmhrm/ui/DeePlugin.java

    r906 r1219  
    7676            fTextTools = new DeeTextTools(true); 
    7777        } 
    78  
    7978        return fTextTools; 
    8079    } 

  • trunk/mmrnmhrm.ui/src/mmrnmhrm/ui/DeeUILanguageToolkit.java

    r749 r1219  
    44import mmrnmhrm.ui.editor.DeeEditor; 
    55import mmrnmhrm.ui.preferences.pages.DeeCompilersPreferencePage; 
     6import mmrnmhrm.ui.preferences.pages.DeeEditorPreferencePage; 
     7import mmrnmhrm.ui.preferences.pages.DeeSourceColoringPreferencePage; 
     8import mmrnmhrm.ui.preferences.pages.DeeTemplatePreferencePage; 
    69import mmrnmhrm.ui.text.DeeSimpleSourceViewerConfiguration; 
    710 
    …… 
    1316import org.eclipse.dltk.ui.text.ScriptTextTools; 
    1417import org.eclipse.dltk.ui.viewsupport.ScriptUILabelProvider; 
    15 import org.eclipse.jface.dialogs.IDialogSettings; 
    1618import org.eclipse.jface.preference.IPreferenceStore; 
    1719 
    …… 
    3234     
    3335    //@Override 
    34     public IDialogSettings getDialogSettings() { 
     36    /** XXX: @deprecated DLTK orphan */ 
     37    /*public IDialogSettings getDialogSettings() { 
    3538        return DeePlugin.getInstance().getDialogSettings(); 
    36     } 
     39    }*/ 
    3740     
    3841    //@Override 
    …… 
    4649    } 
    4750     
     51    //XXX: DLTK: use DLTK partitioning? 
    4852    //@Override 
    4953    public String getPartitioningId() { 
    …… 
    5761     
    5862    //@Override 
    59     public ScriptSourceViewerConfiguration createSourceViwerConfiguration() { 
    60         return new DeeSimpleSourceViewerConfiguration(getTextTools() 
    61                 .getColorManager(), getPreferenceStore(), null, 
    62                 getPartitioningId(), false); 
     63    public ScriptSourceViewerConfiguration createSourceViewerConfiguration() { 
     64        return new DeeSimpleSourceViewerConfiguration(getTextTools().getColorManager(), 
     65                getPreferenceStore(), null, getPartitioningId(), false); 
    6366    } 
    6467     
    6568    //@Override 
    66     public ScriptUILabelProvider createScripUILabelProvider() { 
     69    public ScriptUILabelProvider createScriptUILabelProvider() { 
    6770        return new DeeScriptUILabelProvider(); 
    6871    } 
    …… 
    7780        return DeeCompilersPreferencePage.PAGE_ID; 
    7881    } 
     82     
     83    public String[] getEditorPreferencePages() { 
     84        return new String[]{  
     85                DeeEditorPreferencePage.PAGE_ID,  
     86                DeeTemplatePreferencePage.PAGE_ID, 
     87                DeeSourceColoringPreferencePage.PAGE_ID}; 
     88    } 
     89     
     90    //@Override 
     91    public String getDebugPreferencePage() { 
     92        // TODO DLTK getDebugPreferencePage 
     93        return null; 
     94    } 
     95     
    7996 
    8097    //@Override 
    …… 
    89106    } 
    90107 
     108 
     109 
    91110} 

  • trunk/mmrnmhrm.ui/src/mmrnmhrm/ui/actions/AddSourceFolderHandler.java

    r757 r1219  
    2424public class AddSourceFolderHandler extends AbstractHandler { 
    2525 
    26     @Override 
     26    //@Override 
    2727    public Object execute(ExecutionEvent event) throws ExecutionException { 
    2828 

  • trunk/mmrnmhrm.ui/src/mmrnmhrm/ui/actions/DeeInvokeContentAssistHandler.java

    r866 r1219  
    1212public class DeeInvokeContentAssistHandler extends AbstractHandler { 
    1313 
    14     @Override 
     14    //@Override 
    1515    public Object execute(final ExecutionEvent event) throws ExecutionException { 
    1616         

  • trunk/mmrnmhrm.ui/src/mmrnmhrm/ui/actions/DeeOpenSearchPageHandler.java

    r671 r1219  
    1616    } 
    1717     
    18     @Override 
     18    //@Override 
    1919    public Object execute(ExecutionEvent event) throws ExecutionException { 
    2020        DeeOpenSearchPageAction action = new DeeOpenSearchPageAction(); 

  • trunk/mmrnmhrm.ui/src/mmrnmhrm/ui/actions/DeeOpenTypeHandler.java

    r671 r1219  
    88public class DeeOpenTypeHandler extends AbstractHandler { 
    99 
    10     @Override 
     10    //@Override 
    1111    public Object execute(ExecutionEvent arg0) throws ExecutionException { 
    1212        new DeeOpenTypeAction().run(); 

  • trunk/mmrnmhrm.ui/src/mmrnmhrm/ui/actions/DeeOpenTypeInHierarchyAction.java

    r749 r1219  
    33import mmrnmhrm.ui.DeeUILanguageToolkit; 
    44 
    5 import org.eclipse.dltk.internal.ui.actions.OpenTypeInHierarchyAction; 
    65import org.eclipse.dltk.ui.IDLTKUILanguageToolkit; 
     6import org.eclipse.dltk.ui.actions.OpenTypeInHierarchyAction; 
    77 
    88@SuppressWarnings("restriction") 

  • trunk/mmrnmhrm.ui/src/mmrnmhrm/ui/actions/GoToDefinitionHandler.java

    r758 r1219  
    4545    private static final String GO_TO_DEFINITION_OPNAME = "Go to Definition"; 
    4646 
    47     @Override 
     47    //@Override 
    4848    public Object execute(ExecutionEvent event) throws ExecutionException { 
    4949         

  • trunk/mmrnmhrm.ui/src/mmrnmhrm/ui/actions/RefreshModelHandler.java

    r749 r1219  
    99public class RefreshModelHandler extends AbstractHandler { 
    1010 
    11     @Override 
     11    //@Override 
    1212    public Object execute(ExecutionEvent event) throws ExecutionException { 
    1313        /*try { 

  • trunk/mmrnmhrm.ui/src/mmrnmhrm/ui/actions/SampleHandler.java

    r749 r1219  
    2323     * from the application context. 
    2424     */ 
    25     @Override 
     25    //@Override 
    2626    public Object execute(ExecutionEvent event) throws ExecutionException { 
    2727        IWorkbenchWindow window = HandlerUtil.getActiveWorkbenchWindowChecked(event); 

  • trunk/mmrnmhrm.ui/src/mmrnmhrm/ui/actions/SampleTest1Handler.java

    r749 r1219  
    99 
    1010 
    11     @Override 
     11    //@Override 
    1212    public Object execute(ExecutionEvent event) throws ExecutionException { 
    1313        //IWorkbenchWindow window = HandlerUtil.getActiveWorkbenchWindowChecked(event); 

  • trunk/mmrnmhrm.ui/src/mmrnmhrm/ui/actions/SampleTest2Handler.java

    r749 r1219  
    5353    }*/ 
    5454     
    55     @Override 
     55    //@Override 
    5656    public Object execute(ExecutionEvent event) throws ExecutionException { 
    5757        /*try { 

  • trunk/mmrnmhrm.ui/src/mmrnmhrm/ui/editor/DeeEditor.java

    r757 r1219  
    5858     
    5959    @Override 
    60     protected void connectPartitioningToElement(IEditorInput input, 
    61             IDocument document) { 
     60    protected void connectPartitioningToElement(IEditorInput input, IDocument document) { 
    6261        if (document instanceof IDocumentExtension3) { 
    6362            IDocumentExtension3 extension = (IDocumentExtension3) document; 

  • trunk/mmrnmhrm.ui/src/mmrnmhrm/ui/editor/DeeFoldingStructureProvider.java

    r804 r1219  
    11package mmrnmhrm.ui.editor; 
    22 
    3 import mmrnmhrm.core.dltk.DeeSourceParser; 
     3import mmrnmhrm.core.model.DeeNature; 
    44import mmrnmhrm.ui.DeePlugin; 
    55import mmrnmhrm.ui.text.DeePartitions; 
    …… 
    77import org.eclipse.core.runtime.ILog; 
    88import org.eclipse.dltk.ast.ASTNode; 
    9 import org.eclipse.dltk.ast.declarations.ISourceParser; 
    109import org.eclipse.dltk.ui.text.folding.AbstractASTFoldingStructureProvider; 
    1110import org.eclipse.jface.text.rules.IPartitionTokenScanner; 
    …… 
    1514 
    1615// TODO finish 
    17 public class DeeFoldingStructureProvider extends 
    18         AbstractASTFoldingStructureProvider { 
     16public class DeeFoldingStructureProvider extends AbstractASTFoldingStructureProvider { 
    1917 
    2018    @Override 
    …… 
    2321    } 
    2422 
     23 
     24    @Override 
     25    protected String getNatureId() { 
     26        return DeeNature.NATURE_ID; 
     27    } 
    2528 
    2629    @Override 
    …… 
    4750 
    4851    @Override 
    49     protected ISourceParser getSourceParser() { 
    50         return DeeSourceParser.getInstance(); 
    51     } 
    52  
    53     @Override 
    54     protected boolean initiallyCollapse(ASTNode s, 
    55             FoldingStructureComputationContext ctx) { 
     52    protected boolean initiallyCollapse(ASTNode s, FoldingStructureComputationContext ctx) { 
    5653        return false; 
    5754    } 
    5855 
    5956    @Override 
    60     protected boolean initiallyCollapseComments( 
    61             FoldingStructureComputationContext ctx) { 
     57    protected boolean initiallyCollapseComments(FoldingStructureComputationContext ctx) { 
    6258        return false; 
    6359    } 
    …… 
    6864            @Override 
    6965            public boolean visit(ASTNode node) throws Exception { 
    70                 if(node instanceof DefinitionAggregate) { 
     66                if (node instanceof DefinitionAggregate) { 
    7167                    add(node); 
    7268                } else if (node instanceof DefinitionFunction) { 
    …… 
    7571                return super.visit(node); 
    7672            } 
    77              
     73 
    7874        }; 
    7975    } 
    8076 
    8177    @Override 
    82     protected boolean mayCollapse(ASTNode node, 
    83             FoldingStructureComputationContext ctx) { 
    84         if(node instanceof DefinitionAggregate) { 
     78    protected boolean mayCollapse(ASTNode node, FoldingStructureComputationContext ctx) { 
     79        if (node instanceof DefinitionAggregate) { 
    8580            return true; 
    86         } else if(node instanceof DefinitionFunction) { 
     81        } else if (node instanceof DefinitionFunction) { 
    8782            return true; 
    8883        } 
    …… 
    9085    } 
    9186 
     87 
    9288} 

  • trunk/mmrnmhrm.ui/src/mmrnmhrm/ui/editor/DeeOutlinePage.java

    r749 r1219  
    55import melnorme.util.ui.swt.SWTUtilExt; 
    66import mmrnmhrm.core.dltk.DeeModuleDeclaration; 
    7 import mmrnmhrm.core.dltk.ParsingUtil; 
     7import mmrnmhrm.core.dltk.DeeParserUtil; 
    88 
    99import org.eclipse.dltk.core.DLTKCore; 
    …… 
    9999            if(parent instanceof ISourceModule) { 
    100100                ISourceModule sourceModule = (ISourceModule) parent; 
    101                 DeeModuleDeclaration moduleDec = ParsingUtil.parseModule(sourceModule); 
     101                DeeModuleDeclaration moduleDec = DeeParserUtil.parseModule(sourceModule); 
    102102                if(moduleDec != null) 
    103                     return super.getElements(ParsingUtil.getNeoASTModule(moduleDec)); 
     103                    return super.getElements(DeeParserUtil.getNeoASTModule(moduleDec)); 
    104104            } 
    105105            return ASTNode.NO_ELEMENTS; 

  • trunk/mmrnmhrm.ui/src/mmrnmhrm/ui/editor/templates/DeeTemplateContext.java

    r671 r1219  
    88public class DeeTemplateContext extends ScriptTemplateContext { 
    99 
    10     public DeeTemplateContext(TemplateContextType type, IDocument document, 
    11             int completionOffset, int completionLength, 
    12             ISourceModule sourceModule) { 
     10    public DeeTemplateContext(TemplateContextType type, IDocument document, int completionOffset, 
     11            int completionLength, ISourceModule sourceModule) { 
    1312        super(type, document, completionOffset, completionLength, sourceModule); 
    1413    } 

  • trunk/mmrnmhrm.ui/src/mmrnmhrm/ui/editor/templates/DeeUniversalTemplateContextType.java

    r671 r1219  
    44import org.eclipse.dltk.ui.templates.ScriptTemplateContext; 
    55import org.eclipse.dltk.ui.templates.ScriptTemplateContextType; 
    6 import org.eclipse.dltk.ui.templates.ScriptTemplateVariables; 
    76import org.eclipse.jface.text.IDocument; 
    8 import org.eclipse.jface.text.templates.GlobalTemplateVariables; 
    97 
    108public class DeeUniversalTemplateContextType extends ScriptTemplateContextType { 
    …… 
    1210    public static final String CONTEXT_TYPE_ID = "DeeUniversalTemplateContextType"; 
    1311     
    14     private void addGlobalResolvers() { 
    15         addResolver(new GlobalTemplateVariables.Cursor()); 
    16         addResolver(new GlobalTemplateVariables.WordSelection()); 
    17         addResolver(new GlobalTemplateVariables.LineSelection()); 
    18         addResolver(new GlobalTemplateVariables.Dollar()); 
    19         addResolver(new GlobalTemplateVariables.Date()); 
    20         addResolver(new GlobalTemplateVariables.Year()); 
    21         addResolver(new GlobalTemplateVariables.Time()); 
    22         addResolver(new GlobalTemplateVariables.User()); 
    23         addResolver(new ScriptTemplateVariables.File());         
    24         addResolver(new ScriptTemplateVariables.Language()); 
    25     } 
    26  
    27     public DeeUniversalTemplateContextType() { 
    28         addGlobalResolvers(); 
    29     } 
    30  
    31     public DeeUniversalTemplateContextType(String id) { 
    32         super(id); 
    33         addGlobalResolvers(); 
    34     } 
    35  
    36     public DeeUniversalTemplateContextType(String id, String name) { 
    37         super(id, name); 
    38         addGlobalResolvers(); 
    39     } 
    40  
    4112    @Override 
    42     public ScriptTemplateContext createContext(IDocument document, 
    43             int completionPosition, int length, ISourceModule sourceModule) { 
     13    public ScriptTemplateContext createContext(IDocument document, int completionPosition, 
     14            int length, ISourceModule sourceModule) { 
    4415        return new DeeTemplateContext(this, document, completionPosition, length, sourceModule); 
    4516    } 

  • trunk/mmrnmhrm.ui/src/mmrnmhrm/ui/editor/templates/RubyTemplateAccess.java

    r671 r1219  
    11package mmrnmhrm.ui.editor.templates; 
    2  
    3 import java.io.IOException; 
    42 
    53import mmrnmhrm.ui.DeePlugin; 
    64 
     5import org.eclipse.dltk.ui.templates.ScriptTemplateAccess; 
    76import org.eclipse.jface.preference.IPreferenceStore; 
    8 import org.eclipse.jface.text.templates.ContextTypeRegistry; 
    9 import org.eclipse.jface.text.templates.persistence.TemplateStore; 
    10 import org.eclipse.ui.editors.text.templates.ContributionContextTypeRegistry; 
    11 import org.eclipse.ui.editors.text.templates.ContributionTemplateStore; 
    127 
    138// TODO: DLTK learn more 
    14 public class RubyTemplateAccess { 
     9/** 
     10 * Provides access to the Ruby template store. 
     11 */ 
     12public class RubyTemplateAccess extends ScriptTemplateAccess { 
    1513    // Template 
    16     private static final String CUSTOM_TEMPLATES_KEY = "mmrnmhrm.Templates"; 
    17      
    18     private static TemplateStore fStore; 
    19     private static ContributionContextTypeRegistry fRegistry; 
    20      
    21     protected static IPreferenceStore getPreferenceStore() {  
     14    private static final String CUSTOM_TEMPLATES_KEY = "mmrnmhrm.Templates"; //$NON-NLS-1$ 
     15 
     16    private static RubyTemplateAccess instance; 
     17 
     18    public static RubyTemplateAccess getInstance() { 
     19        if (instance == null) { 
     20            instance = new RubyTemplateAccess(); 
     21        } 
     22        return instance; 
     23    } 
     24 
     25    /* 
     26     * @see org.eclipse.dltk.ui.templates.ScriptTemplateAccess#getPreferenceStore() 
     27     */ 
     28    @Override 
     29    protected IPreferenceStore getPreferenceStore() { 
    2230        return DeePlugin.getDefault().getPreferenceStore(); 
    2331    } 
    24      
    25     public static ContextTypeRegistry getContextTypeRegistry() { 
    26         if (fRegistry == null) { 
    27             fRegistry = new ContributionContextTypeRegistry(); 
    28             fRegistry.addContextType(DeeUniversalTemplateContextType.CONTEXT_TYPE_ID); 
    29         } 
    3032 
    31         return fRegistry; 
    32     } 
    33      
    34     public static TemplateStore getTemplateStore() { 
    35         if (fStore == null) { 
    36             fStore = new ContributionTemplateStore(getContextTypeRegistry(), 
    37                     getPreferenceStore(), CUSTOM_TEMPLATES_KEY); 
    38             try { 
    39                 fStore.load(); 
    40             } catch (IOException e) { 
    41                 // TODO: handle 
    42                 e.printStackTrace(); 
    43                 throw new RuntimeException(e); 
    44             } 
    45         } 
    46  
    47         return fStore; 
     33    /* 
     34     * @see org.eclipse.dltk.ui.templates.ScriptTemplateAccess#getContextTypeId() 
     35     */ 
     36    @Override 
     37    protected String getContextTypeId() { 
     38        return DeeUniversalTemplateContextType.CONTEXT_TYPE_ID; 
    4839    } 
    4940 
     41    /* 
     42     * @see org.eclipse.dltk.ui.templates.ScriptTemplateAccess#getCustomTemplatesKey() 
     43     */ 
     44    @Override 
     45    protected String getCustomTemplatesKey() { 
     46        return CUSTOM_TEMPLATES_KEY; 
     47    } 
    5048} 

  • trunk/mmrnmhrm.ui/src/mmrnmhrm/ui/editor/text/AbstractCompletionProposal.java

    r906 r1219  
    44import org.eclipse.core.runtime.Assert; 
    55import org.eclipse.core.runtime.IProgressMonitor; 
     6import org.eclipse.dltk.internal.ui.BrowserInformationControl; 
    67import org.eclipse.jdt.internal.ui.JavaPlugin; 
    78import org.eclipse.jface.text.AbstractReusableInformationControlCreator; 
    …… 
    241242    @SuppressWarnings("restriction") 
    242243    public IInformationControlCreator getInformationControlCreator() { 
    243         Shell shell= JavaPlugin.getActiveWorkbenchShell(); 
     244        Shell shell = JavaPlugin.getActiveWorkbenchShell(); 
    244245        if (shell == null 
    245246                || !org.eclipse.jface.internal.text.html.BrowserInformationControl 
    …… 
    248249         
    249250        if (fCreator == null) { 
    250             fCreator= new ControlCreator(); 
    251         } 
     251            fCreator = new AbstractReusableInformationControlCreator() { 
     252 
     253                @Override 
     254                public IInformationControl doCreateInformationControl(Shell parent) { 
     255                    return new BrowserInformationControl(parent, SWT.NO_TRIM | SWT.TOOL, SWT.NONE, 
     256                            null); 
     257                } 
     258            }; 
     259        } 
     260         
    252261        return fCreator; 
    253262    } 
    254  
    255     private static final class ControlCreator extends AbstractReusableInformationControlCreator { 
    256         @SuppressWarnings("restriction") 
    257         @Override 
    258         public IInformationControl doCreateInformationControl(Shell parent) { 
    259             return new org.eclipse.jface.internal.text.html.BrowserInformationControl( 
    260                     parent, SWT.NO_TRIM | SWT.TOOL, SWT.NONE, null); 
    261         } 
    262     } 
     263     
    263264 
    264265    public Object getAdditionalProposalInfo(IProgressMonitor monitor) { 

  • trunk/mmrnmhrm.ui/src/mmrnmhrm/ui/editor/text/AbstractTextHover.java

    r906 r1219  
    3131    } 
    3232 
    33     @SuppressWarnings("restriction") 
    3433    protected String getCSSStyles() { 
    3534        if(false) 

  • trunk/mmrnmhrm.ui/src/mmrnmhrm/ui/editor/text/DeeCodeContentAssistProcessor.java

    r866 r1219  
    2525import dtool.refmodel.PrefixDefUnitSearch.IDefUnitMatchAccepter; 
    2626 
     27// TODO: DTLK: Start using ScriptCompletionProposal ? 
    2728public class DeeCodeContentAssistProcessor implements IContentAssistProcessor { 
    2829 

  • trunk/mmrnmhrm.ui/src/mmrnmhrm/ui/editor/text/DeeElementHyperlink.java

    r757 r1219  
    5858 
    5959    public String getTypeLabel() { 
    60         return null; 
     60        return "Open Dee Definition"; 
    6161    } 
    6262 
    6363    public String getHyperlinkText() { 
    64         return null; 
     64        return "Open Dee Definition"; 
    6565    } 
    6666} 

  • trunk/mmrnmhrm.ui/src/mmrnmhrm/ui/editor/text/DeeHyperlinkDetector.java

    r758 r1219  
    2323            IRegion region, boolean canShowMultipleHyperlinks) { 
    2424        ITextEditor textEditor= (ITextEditor)getAdapter(ITextEditor.class); 
    25         if (region == null || canShowMultipleHyperlinks || !(textEditor instanceof DeeEditor)) 
     25        if (region == null || !(textEditor instanceof DeeEditor)) 
    2626            return null; 
    2727         

  • trunk/mmrnmhrm.ui/src/mmrnmhrm/ui/launch/DeeMainLaunchConfigurationTab.java

    r833 r1219  
    11package mmrnmhrm.ui.launch; 
    22 
    3 import melnorme.miscutil.ExceptionAdapter; 
    43import mmrnmhrm.core.dltk.DeeLanguageToolkit; 
    5 import mmrnmhrm.core.launch.DeeLaunchConfigurationDelegate; 
    6 import mmrnmhrm.core.model.DeeModel; 
    74import mmrnmhrm.core.model.DeeNature; 
    8 import mmrnmhrm.core.model.DeeProjectOptions; 
     5import mmrnmhrm.ui.DeePlugin; 
    96 
    10 import org.eclipse.core.runtime.CoreException; 
    117import org.eclipse.debug.core.ILaunchConfiguration; 
    12 import org.eclipse.dltk