From: n.hoffmann Date: Mon, 9 Mar 2009 15:56:59 +0000 (+0000) Subject: hid some features that are not fully operational X-Git-Tag: rcp.ss-first-working-version~921 X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/6bc0e483e91d0a043ec449a96f62109929dca275 hid some features that are not fully operational --- diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/plugin.xml b/eclipseprojects/eu.etaxonomy.taxeditor/plugin.xml index aa60942fa..0ff324c82 100644 --- a/eclipseprojects/eu.etaxonomy.taxeditor/plugin.xml +++ b/eclipseprojects/eu.etaxonomy.taxeditor/plugin.xml @@ -201,7 +201,7 @@ name="eu.etaxonomy.taxeditor.ui.file.separator3" visible="true"> - @@ -210,7 +210,7 @@ commandId="eu.etaxonomy.taxeditor.noCmdYet" label="Export" style="push"> - + --> @@ -484,6 +484,11 @@ id="eu.etaxonomy.taxeditor.editor.swapTaxonSynonym" name="Swap Taxon Synonym"> + + diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/ApplicationActionBarAdvisor.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/ApplicationActionBarAdvisor.java index 004c8c469..b493d79a0 100644 --- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/ApplicationActionBarAdvisor.java +++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/ApplicationActionBarAdvisor.java @@ -38,6 +38,15 @@ public class ApplicationActionBarAdvisor extends ActionBarAdvisor { private static final Logger logger = Logger .getLogger(ApplicationActionBarAdvisor.class); + private List importActionList; + + private IAction exportJaxbAction; + + + public ApplicationActionBarAdvisor(IActionBarConfigurer configurer) { + super(configurer); + } + protected void makeActions(final IWorkbenchWindow window) { GlobalController.setStatusLineManager(getActionBarConfigurer().getStatusLineManager()); } @@ -45,6 +54,7 @@ public class ApplicationActionBarAdvisor extends ActionBarAdvisor { protected void fillMenuBar(IMenuManager menuBar) { } + // Actions - important to allocate these only in makeActions, and then use // them in the fill methods. This ensures that the actions aren't recreated // when fillActionBars is called with FILL_PROXY. @@ -56,15 +66,8 @@ public class ApplicationActionBarAdvisor extends ActionBarAdvisor { // // private IAction newNameAction; - private List importActionList; - - private IAction exportJaxbAction; - - - public ApplicationActionBarAdvisor(IActionBarConfigurer configurer) { - super(configurer); - } + @Deprecated protected void _makeActions(final IWorkbenchWindow window) { // Creates the actions and registers them. // Registering is needed to ensure that key bindings work. @@ -102,7 +105,7 @@ public class ApplicationActionBarAdvisor extends ActionBarAdvisor { register(exportJaxbAction); } - + @Deprecated private void makeImportActions() { // importActionList = new ArrayList(); @@ -114,6 +117,7 @@ public class ApplicationActionBarAdvisor extends ActionBarAdvisor { // } } + @Deprecated private MenuManager FILE_MENU(){ MenuManager fileMenu = new MenuManager("&File", IWorkbenchActionConstants.M_FILE); @@ -144,7 +148,7 @@ public class ApplicationActionBarAdvisor extends ActionBarAdvisor { return fileMenu; } - + @Deprecated private MenuManager EDIT_MENU() { MenuManager editMenu = new MenuManager("&Edit", IWorkbenchActionConstants.M_EDIT); @@ -161,6 +165,7 @@ public class ApplicationActionBarAdvisor extends ActionBarAdvisor { return editMenu; } + @Deprecated private MenuManager WINDOW_MENU() { MenuManager windowMenu = new MenuManager("&Window", IWorkbenchActionConstants.M_WINDOW); @@ -170,6 +175,7 @@ public class ApplicationActionBarAdvisor extends ActionBarAdvisor { return windowMenu; } + @Deprecated private MenuManager HELP_MENU(){ MenuManager helpMenu = new MenuManager("&Help", IWorkbenchActionConstants.M_HELP); @@ -179,6 +185,7 @@ public class ApplicationActionBarAdvisor extends ActionBarAdvisor { return helpMenu; } + @Deprecated protected void _fillMenuBar(IMenuManager menuBar) { menuBar.add(FILE_MENU()); diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/ApplicationWorkbenchWindowAdvisor.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/ApplicationWorkbenchWindowAdvisor.java index 6cd9385ec..9772b34a2 100644 --- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/ApplicationWorkbenchWindowAdvisor.java +++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/ApplicationWorkbenchWindowAdvisor.java @@ -44,7 +44,7 @@ public class ApplicationWorkbenchWindowAdvisor extends WorkbenchWindowAdvisor { public void preWindowOpen() { IWorkbenchWindowConfigurer configurer = getWindowConfigurer(); configurer.setInitialSize(new Point(963, 637)); - configurer.setShowCoolBar(true); + configurer.setShowCoolBar(false); configurer.setShowStatusLine(true); configurer.setShowPerspectiveBar(true); configurer.setTitle("EDIT Taxonomic Editor");