Project

General

Profile

« Previous | Next » 

Revision 843dce37

Added by Katja Luther about 3 years ago

fix fragment.e4xmi after renaming of termtree

View differences:

eu.etaxonomy.taxeditor.store/fragment.e4xmi
14 14
      <handlers xmi:id="_87dsoIdPEeecZ4F2Y9Z0Og" elementId="eu.etaxonomy.taxeditor.editor.definedterm.e4.handler.CreateTermVocabularyHandlerE4" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.editor.definedterm.e4.handler.CreateTermVocabularyHandlerE4" command="_5mFFMIdPEeecZ4F2Y9Z0Og"/>
15 15
      <handlers xmi:id="_b8sJAIdQEeecZ4F2Y9Z0Og" elementId="eu.etaxonomy.taxeditor.editor.definedterm.e4.handler.DeleteTermBaseHandlerE4" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.editor.definedterm.e4.handler.DeleteTermBaseHandlerE4" command="_Z_XgsIdQEeecZ4F2Y9Z0Og"/>
16 16
      <handlers xmi:id="_B7cTkIfSEeecZ4F2Y9Z0Og" elementId="eu.etaxonomy.taxeditor.editor.definedterm.e4.handler.CreateDefinedTermHandlerE4.newDefinedTerm" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.editor.definedterm.e4.handler.CreateDefinedTermHandlerE4" command="_GTbAcIfSEeecZ4F2Y9Z0Og"/>
17
      <handlers xmi:id="_NqtXEIfSEeecZ4F2Y9Z0Og" elementId="eu.etaxonomy.taxeditor.editor.definedterm.e4.handler.CreateDefinedTermHandlerE4.newKindOfTerm" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.editor.definedterm.e4.handler.CreateDefinedTermHandlerE4" command="_LMwG4IfSEeecZ4F2Y9Z0Og"/>
17
      <handlers xmi:id="_NqttermtreemHandlerXEIfSEeecZ4F2Y9Z0Og" elementId="eu.etaxonomy.taxeditor.editor.definedterm.e4.handler.CreateDefinedTermHandlerE4.newKindOfTerm" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.editor.definedterm.e4.handler.CreateDefinedTermHandlerE4" command="_LMwG4IfSEeecZ4F2Y9Z0Og"/>
18 18
      <handlers xmi:id="_yPjL8EAVEembfJNLZI9wiA" elementId="eu.etaxonomy.taxeditor.editor.definedterm.e4.handler.MoveDefinedTermHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.editor.definedterm.e4.handler.MoveDefinedTermHandler" command="_d6YpoEAVEembfJNLZI9wiA"/>
19 19
      <menus xsi:type="menu:PopupMenu" xmi:id="_CoJioIdQEeecZ4F2Y9Z0Og" elementId="eu.etaxonomy.taxeditor.store.popupmenu.termeditor">
20 20
        <children xsi:type="menu:Menu" xmi:id="_DR1Y0IdQEeecZ4F2Y9Z0Og" elementId="eu.etaxonomy.taxeditor.store.menu.menulabel0" label="%menu.label.0">
......
41 41
    <elements xsi:type="basic:PartDescriptor" xmi:id="_XV6gkEbOEeiER_VRS0L7wA" elementId="eu.etaxonomy.taxeditor.view.webimport.termimport.GfBioTerminologyImportPart" label="%partdescriptor.label.1" tooltip="%partdescriptor.tooltip.1" closeable="true" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.view.webimport.termimport.GfBioTerminologyImportPart"/>
42 42
    <elements xsi:type="basic:PartDescriptor" xmi:id="_namYwB7xEemDKJyLc5CJfQ" elementId="eu.etaxonomy.taxeditor.store.partdescriptor.termsearch" label="%partdescriptor.label.2" closeable="true" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.view.search.facet.term.TermSearch"/>
43 43
    <elements xsi:type="basic:PartDescriptor" xmi:id="_mbegMDNMEemOn_75IU-Tvg" elementId="eu.etaxonomy.taxeditor.store.partdescriptor.occurencesearch" label="%partdescriptor.label.3" closeable="true" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.view.search.facet.occurrence.OccurrenceSearch"/>
44
    <elements xsi:type="basic:PartDescriptor" xmi:id="_-y1CcMKPEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.featuretree.e4.termTreeEditor" label="%partdescriptor.label.featureTreeEditor" tooltip="" allowMultiple="true" closeable="true" dirtyable="true" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.termtree.TermTreeEditor">
44
    <elements xsi:type="basic:PartDescriptor" xmi:id="_-y1CcMKPEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.termtree.e4.termTreeEditor" label="%partdescriptor.label.featureTreeEditor" tooltip="" allowMultiple="true" closeable="true" dirtyable="true" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.termtree.e4.TermTreeEditor">
45 45
      <tags>nonRestore</tags>
46 46
      <handlers xmi:id="_-y1CccKPEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.featuretree.e4.handler.CreateFeatureTreeHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.termtree.e4.handler.CreateTermTreeHandler" command="_AJtnsCHXEeiP8eNo0PEm1g"/>
47 47
      <handlers xmi:id="_-y1CcsKPEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.featuretree.e4.handler.RemoveFeatureTreeHandlers" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.termtree.e4.handler.RemoveTermTreeHandler" command="_3mqzkCFdEeiVXriJfxPIuA"/>
48 48
      <handlers xmi:id="_-y1Cc8KPEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.featuretree.e4.handler.FeatureTreeExportWordHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.termtree.e4.handler.TermTreeExportWordHandler" command="_I_yx4GcqEee0qLTtA2ZpVQ"/>
49 49
      <handlers xmi:id="_-y1CdMKPEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.featuretree.e4.handler.AddFeatureHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.termtree.e4.handler.AddTermHandler" command="_oftL0GceEee0qLTtA2ZpVQ"/>
50 50
      <handlers xmi:id="_-y1CdcKPEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.featuretree.e4.handler.FeatureTreeExportOntologyHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.termtree.e4.handler.TermTreeExportOntologyHandler" command="_xyZ4oPhmEei8uPv-H2wqnw"/>
51
      <menus xsi:type="menu:PopupMenu" xmi:id="_-y1CeMKPEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.store.popupmenu.featureTreeEditor">
51
      <menus xsi:type="menu:PopupMenu" xmi:id="_-y1CeMKPEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.store.popupmenu.termTreeEditor">
52 52
        <children xsi:type="menu:HandledMenuItem" xmi:id="_-y1CecKPEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.newfeaturetree" label="%handledmenuitem.label.1" iconURI="platform:/plugin/org.eclipse.ui/icons/full/etool16/new_wiz.png" command="_AJtnsCHXEeiP8eNo0PEm1g"/>
53 53
        <children xsi:type="menu:MenuSeparator" xmi:id="_-y1CgMKPEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.store.menuseparator.5"/>
54 54
        <children xsi:type="menu:HandledMenuItem" xmi:id="_-y1CgcKPEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.addchildfeature" label="%handledmenuitem.label.2" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.store/icons/add.gif" command="_aPYxsBezEeiXusClKZjycQ"/>
......
148 148
    </elements>
149 149
  </fragments>
150 150
  <fragments xsi:type="fragment:StringModelFragment" xmi:id="_swGH0GhvEee3K4uKJljEYg" featurename="handlers" parentElementId="xpath:/">
151
    <elements xsi:type="commands:Handler" xmi:id="_rVEdIGcjEee0qLTtA2ZpVQ" elementId="eu.etaxonomy.taxeditor.featuretree.e4.handler.RemoveFeatureHandler" contributionURI="bundleclass://eu.ebundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.termtreemHandler" command="_fNBtQGcjEee0qLTtA2ZpVQ"/>
151
    <elements xsi:type="commands:Handler" xmi:id="_rVEdIGcjEee0qLTtA2ZpVQ" elementId="eu.etaxonomy.taxeditor.featuretree.e4.handler.RemoveFeatureHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.termtree.e4.handler.RemoveTermHandler" command="_fNBtQGcjEee0qLTtA2ZpVQ"/>
152 152
    <elements xsi:type="commands:Handler" xmi:id="_tyCPYIdPEeecZ4F2Y9Z0Og" elementId="eu.etaxonomy.taxeditor.editor.definedterm.e4.handler.OpenDefinedTermEditorHandlerE4" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.editor.definedterm.e4.handler.OpenDefinedTermEditorHandlerE4" command="_n5NykDoqEeud_N8qGaxX2Q"/>
153 153
    <elements xsi:type="commands:Handler" xmi:id="_XF8ogJMBEeeR4YRjNqCKeA" elementId="eu.etaxonomy.taxeditor.handler.defaultHandler.e4.DefaultOpenTaxonNodeWizardHandlerE4" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.handler.defaultHandler.e4.DefaultOpenTaxonNodeWizardHandlerE4" command="_cE510JMBEeeR4YRjNqCKeA"/>
154 154
    <elements xsi:type="commands:Handler" xmi:id="_8HUM8JMCEeeR4YRjNqCKeA" elementId="eu.etaxonomy.taxeditor.handler.defaultHandler.e4.DefaultOpenClassificationWizardHandlerE4" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.handler.defaultHandler.e4.DefaultOpenClassificationWizardHandlerE4" command="_zJ4-8JMCEeeR4YRjNqCKeA"/>
......
179 179
    <elements xsi:type="commands:Handler" xmi:id="_VBYX4MiQEeiKErB3UVzQug" elementId="eu.etaxonomy.taxeditor.handler.e4.OpenDistributionStausWizardAdminHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.handler.e4.OpenDistributionStatusWizardAdminHandler" command="_tPtdwMiIEeiKErB3UVzQug"/>
180 180
    <elements xsi:type="commands:Handler" xmi:id="_jnQb8MrcEeiKErB3UVzQug" elementId="eu.etaxonomy.taxeditor.handler.e4.OpenCommonNameAreaWizardHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.handler.e4.OpenCommonNameAreaWizardAdminHandler" command="_tRsg8MrcEeiKErB3UVzQug"/>
181 181
    <elements xsi:type="commands:Handler" xmi:id="_H_c_EEq2EeeN-dEYnw7m3g" elementId="eu.etaxonomy.taxeditor.featuretree.handler.SaveHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.workbench/eu.etaxonomy.taxeditor.workbench.SaveHandler" command="_LlbAMEq2EeeN-dEYnw7m3g"/>
182
    <elements xsi:type="commands:Handler" xmi:id="_hPTxMBezEeiXusClKZjycQ" elementId="eu.etaxonomy.taxeditor.featuretree.e4.handler.AddChildFeatureHandler" contributionURI="bundleclass://eu.etaxbundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.termtreeHandler" command="_aPYxsBezEeiXusClKZjycQ"/>
183
    <elements xsi:type="commands:Handler" xmi:id="_i-FlkNjyEeidDMMI9xTsbQ" elementId="eu.etaxonomy.taxeditor.featuretree.e4.handler.CopyFeatureHandler" contributionURI="bundleclass://eu.etaxonobundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.termtree" command="_cMyQ4NjyEeidDMMI9xTsbQ"/>
184
    <elements xsi:type="commands:Handler" xmi:id="_tzQ_YNjyEeidDMMI9xTsbQ" elementId="eu.etaxonomy.taxeditor.featuretree.e4.handler.PasteFeatureHandler" contributionURI="bundleclass://eu.etaxonomy.bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.termtreer" command="_xDk5kNjyEeidDMMI9xTsbQ"/>
182
    <elements xsi:type="commands:Handler" xmi:id="_hPTxMBezEeiXusClKZjycQ" elementId="eu.etaxonomy.taxeditor.featuretree.e4.handler.AddChildFeatureHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.termtree.e4.handler.AddChildTermHandler" command="_aPYxsBezEeiXusClKZjycQ"/>
183
    <elements xsi:type="commands:Handler" xmi:id="_i-FlkNjyEeidDMMI9xTsbQ" elementId="eu.etaxonomy.taxeditor.featuretree.e4.handler.CopyFeatureHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.termtree.e4.handler.CopyTermHandler" command="_cMyQ4NjyEeidDMMI9xTsbQ"/>
184
    <elements xsi:type="commands:Handler" xmi:id="_tzQ_YNjyEeidDMMI9xTsbQ" elementId="eu.etaxonomy.taxeditor.featuretree.e4.handler.PasteFeatureHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.termtree.e4.handler.PasteTermHandler" command="_xDk5kNjyEeidDMMI9xTsbQ"/>
185 185
    <elements xsi:type="commands:Handler" xmi:id="_xWlngO5vEeizn7bmbAeBkw" elementId="eu.etaxonomy.taxeditor.handler.e4.OpenDistributionStausWizardHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.handler.e4.OpenDistributionStatusWizardHandler" command="_Za5DYO5vEeizn7bmbAeBkw"/>
186 186
    <elements xsi:type="commands:Handler" xmi:id="_i4yZAD8zEemTy7SLZkowuQ" elementId="eu.etaxonomy.taxeditor.store.handler.0" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.handler.OpenDatabaseRepairWizardHandler" command="_qYxw8D85EemTy7SLZkowuQ"/>
187 187
    <elements xsi:type="commands:Handler" xmi:id="_PugRQD86EemTy7SLZkowuQ" elementId="eu.etaxonomy.taxeditor.store.handler.1" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.handler.OpenUpdateSortIndicesHandler" command="_VUQY0D86EemTy7SLZkowuQ"/>
......
192 192
    <elements xsi:type="commands:Handler" xmi:id="_3AxAINL9Eem35L6JVBxwwA" elementId="eu.etaxonomy.taxeditor.handler.e4.OpenCommonNameAreaWizardAdminHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.handler.e4.OpenCommonNameAreaWizardAdminHandler" command="_sKIVINL6Eem35L6JVBxwwA"/>
193 193
    <elements xsi:type="commands:Handler" xmi:id="_wSjnIP5VEeqwiqpCwftRog" elementId="eu.etaxonomy.taxeditor.store.handler.searchForPlugin" command="_qENOgP5VEeqwiqpCwftRog"/>
194 194
    <elements xsi:type="commands:Handler" xmi:id="_4kk8oDoqEeud_N8qGaxX2Q" elementId="eu.etaxonomy.taxeditor.store.OpenDefinedTermHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.editor.definedterm.e4.handler.OpenDefinedTermEditorHandlerE4" command="_qEMrsIdPEeecZ4F2Y9Z0Og"/>
195
    <elements xsi:type="commands:Handler" xmi:id="_4GeBAD4fEeuM4JU-Ch98ZA" elementId="eu.etaxonomy.taxeditor.store.OpenDefinedTermHandler" contributionURI="bundleclass://eu.etaxonomy.taxbundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.termtreedler" command="_8aaicD4fEeuM4JU-Ch98ZA"/>
195
    <elements xsi:type="commands:Handler" xmi:id="_4GeBAD4fEeuM4JU-Ch98ZA" elementId="eu.etaxonomy.taxeditor.store.OpenTermTreeHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.termtree.e4.handler.OpenTermTreeEditorHandler" command="_8aaicD4fEeuM4JU-Ch98ZA"/>
196 196
  </fragments>
197 197
  <fragments xsi:type="fragment:StringModelFragment" xmi:id="_qT4hgIfTEeecZ4F2Y9Z0Og" featurename="children" parentElementId="eu.etaxonomy.taxeditor.workbench.menu.window" positionInList="before:eu.etaxonomy.taxeditor.application.windowMenu.last">
198 198
    <elements xsi:type="menu:Menu" xmi:id="_LT3P8IfcEeecZ4F2Y9Z0Og" elementId="eu.etaxonomy.taxeditor.store.menu.termeditor" label="%menu.label.1">
eu.etaxonomy.taxeditor.store/plugin.xml
119 119
   </propertyTester>
120 120
   <propertyTester
121 121
         class="eu.etaxonomy.taxeditor.termtree.TermTreePropertyTester"
122
         id="eu.etaxonomy.taxeditor.featuretree.TermTreePropertyTester"
123
         namespace="eu.etaxonomy.taxeditor.featuretree.TermTreePropertyTester"
122
         id="eu.etaxonomy.taxeditor.termtree.TermTreePropertyTester"
123
         namespace="eu.etaxonomy.taxeditor.termtree.TermTreePropertyTester"
124 124
         properties="isTermTree"
125 125
         type="org.eclipse.jface.viewers.IStructuredSelection">
126 126
   </propertyTester>
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/AppModelId.java
357 357
	public static final String PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_VIEW_SESSIONS_SESSIONSVIEWPART = "eu.etaxonomy.taxeditor.view.sessions.SessionsViewPart";
358 358
	public static final String PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_VIEW_WEBIMPORT_TERMIMPORT_GFBIOTERMINOLOGYIMPORTPART = "eu.etaxonomy.taxeditor.view.webimport.termimport.GfBioTerminologyImportPart";
359 359
	public static final String POPUPMENU_EU_ETAXONOMY_TAXEDITOR_STORE_POPUPMENU_DATASOURCEVIEW = "eu.etaxonomy.taxeditor.store.popupmenu.datasourceview";
360
	public static final String POPUPMENU_EU_ETAXONOMY_TAXEDITOR_STORE_POPUPMENU_FEATURETREEEDITOR = "eu.etaxonomy.taxeditor.store.popupmenu.featureTreeEditor";
360
	public static final String POPUPMENU_EU_ETAXONOMY_TAXEDITOR_STORE_POPUPMENU_FEATURETREEEDITOR = "eu.etaxonomy.taxeditor.store.popupmenu.termTreeEditor";
361 361
	public static final String POPUPMENU_EU_ETAXONOMY_TAXEDITOR_STORE_POPUPMENU_TERMEDITOR = "eu.etaxonomy.taxeditor.store.popupmenu.termeditor";
362 362
}
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/TermTreePropertyTester.java
17 17
 */
18 18
public class TermTreePropertyTester extends PropertyTester {
19 19

  
20
	private static final String FEATURE_TREE= "isFeatureTree"; //$NON-NLS-1$
20
	private static final String FEATURE_TREE= "isTermTree"; //$NON-NLS-1$
21 21

  
22 22
	@Override
23 23
    public boolean test(Object receiver, String property, Object[] args,
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/TermTreeEditor.java
58 58
import eu.etaxonomy.cdm.persistence.dto.TermNodeDto;
59 59
import eu.etaxonomy.cdm.persistence.dto.TermTreeDto;
60 60
import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;
61
import eu.etaxonomy.taxeditor.editor.definedterm.TermTreeViewerComparator;
62 61
import eu.etaxonomy.taxeditor.editor.definedterm.TermTransfer;
62
import eu.etaxonomy.taxeditor.editor.definedterm.TermTreeViewerComparator;
63 63
import eu.etaxonomy.taxeditor.event.WorkbenchEventConstants;
64 64
import eu.etaxonomy.taxeditor.l10n.Messages;
65 65
import eu.etaxonomy.taxeditor.model.AbstractUtility;
......
91 91
        	IE4ViewerPart, IPartContentHasDetails, IPartContentHasSupplementalData,
92 92
        	IContextListener, IConversationEnabled, IDirtyMarkable {
93 93

  
94
    public static final String OPEN_COMMAND_ID = "eu.etaxonomy.taxeditor.store.openTermTreeEditor";
95

  
94 96
    public static final List<String> TREE_PROPERTY_PATH = Arrays.asList(new String[] {
95 97
            "root", //$NON-NLS-1$
96 98
            "root.children", //$NON-NLS-1$
97 99
            "root.children.inapplicableIf", //$NON-NLS-1$
98
            "root.children.inapplicableIf.feature", //$NON-NLS-1$
100
            "root.children.inapplicableIf.term", //$NON-NLS-1$
99 101
            "root.children.inapplicableIf.state", //$NON-NLS-1$
100 102
            "root.children.onlyApplicableIf", //$NON-NLS-1$
101
            "root.children.onlyApplicableIf.feature", //$NON-NLS-1$
103
            "root.children.onlyApplicableIf.term", //$NON-NLS-1$
102 104
            "root.children.onlyApplicableIf.state", //$NON-NLS-1$
103 105
    });
104 106

  
......
356 358
    public Map<Object, List<String>> getPropertyPathsMap() {
357 359
        List<String> propertyPaths = Arrays.asList(new String[] {
358 360
                "children", //$NON-NLS-1$
359
                "feature", //$NON-NLS-1$
360
                "featureTree", //$NON-NLS-1$
361
                "term", //$NON-NLS-1$
362
                "termTree", //$NON-NLS-1$
361 363
        });
362 364
        Map<Object, List<String>> propertyPathMap =
363 365
                new HashMap<Object, List<String>>();
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/TermTreeEditorComposite.java
46 46
 */
47 47
public class TermTreeEditorComposite <T extends DefinedTermBase> extends Composite{
48 48

  
49
    private TermTree<T> featureTree;
49
    private TermTree<T> termTree;
50 50

  
51 51
    private Label label_title;
52 52
    private Text text_title;
53
    private Button btnOpenFeatureTree;
53
    private Button btnOpenTermTree;
54 54
    private TreeViewer viewer;
55 55

  
56 56
    public TermTreeEditorComposite(Composite parent, int style) {
......
72 72
        text_title.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));
73 73
        text_title.setEditable(false);
74 74

  
75
        btnOpenFeatureTree = new Button(composite_treeTitle, SWT.NONE);
76
        btnOpenFeatureTree.setLayoutData(new GridData(SWT.CENTER, SWT.CENTER, false, false, 1, 1));
77
        btnOpenFeatureTree.setToolTipText(Messages.TermTreeEditorComposite_OPEN_TREE);
78
        btnOpenFeatureTree.setImage(ImageResources.getImage(ImageResources.BROWSE_ICON));
75
        btnOpenTermTree = new Button(composite_treeTitle, SWT.NONE);
76
        btnOpenTermTree.setLayoutData(new GridData(SWT.CENTER, SWT.CENTER, false, false, 1, 1));
77
        btnOpenTermTree.setToolTipText(Messages.TermTreeEditorComposite_OPEN_TREE);
78
        btnOpenTermTree.setImage(ImageResources.getImage(ImageResources.BROWSE_ICON));
79 79

  
80 80
        viewer = new TreeViewer(new Tree(this, SWT.H_SCROLL | SWT.V_SCROLL | SWT.MULTI));
81 81
        Tree tree = viewer.getTree();
......
173 173

  
174 174
        //add specific selection listener
175 175
        if(openFeatureTreeSelectionListener!=null){
176
            btnOpenFeatureTree.addSelectionListener(openFeatureTreeSelectionListener);
176
            btnOpenTermTree.addSelectionListener(openFeatureTreeSelectionListener);
177 177
        }
178 178
        else{
179 179
            //add default selection listener
180
            btnOpenFeatureTree.addSelectionListener(new SelectionAdapter(){
180
            btnOpenTermTree.addSelectionListener(new SelectionAdapter(){
181 181
                @Override
182 182
                public void widgetSelected(SelectionEvent e) {
183 183
                    TermTree<T> tree = FeatureTreeSelectionDialog.select(getDisplay().getActiveShell(),
......
194 194
    }
195 195

  
196 196
    public void setSelectedTree(TermTree<T> featureTree) {
197
        this.featureTree = featureTree;
197
        this.termTree = featureTree;
198 198
        viewer.setInput(featureTree);
199 199
        StoreUtil.setTextWithoutModifyListeners(text_title, featureTree!=null?featureTree.getTitleCache():"");
200 200
    }
201 201

  
202 202
    public TermTree<T> getFeatureTree() {
203
        return featureTree;
203
        return termTree;
204 204
    }
205 205

  
206 206
    public Label getLabel_title() {
......
208 208
    }
209 209

  
210 210
    public Button getBtnOpenFeatureTree() {
211
        return btnOpenFeatureTree;
211
        return btnOpenTermTree;
212 212
    }
213 213

  
214 214
    public TreeViewer getViewer() {

Also available in: Unified diff