SP-625 BIS-398: Simpler Menu. Ongoing work.

SVN: 29131

openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/administration/AdministrationMenu.java

@@ -45,8 +45,13 @@ public class AdministrationMenu extends TopMenuItem
         Menu submenu = new Menu();
         submenu.add(new ActionMenu(TopMenu.ActionMenuKind.ADMINISTRATION_MENU_MANAGE_GROUPS, messageProvider, componentProvider.getGroupBrowser()));
         submenu.add(new ActionMenu(TopMenu.ActionMenuKind.VOCABULARY_MENU_BROWSE, messageProvider, componentProvider.getVocabularyBrowser()));
-        submenu.add(new TypesMenu(messageProvider, componentProvider));
-        submenu.add(new PropertyTypesMenu(viewContext, messageProvider, componentProvider));
+        submenu.add(new TypesMenu(viewContext, messageProvider, componentProvider));
+
+        if (viewContext.getDisplaySettingsManager().isLegacyMedadataUIEnabled())
+        {
+            submenu.add(new PropertyTypesMenu(messageProvider, componentProvider));
+        }
+
         submenu.add(new ActionMenu(TopMenu.ActionMenuKind.SCRIPT_MENU_BROWSE, messageProvider, componentProvider.getScriptBrowser()));
         submenu.add(new AuthorizationMenu(messageProvider, componentProvider));
         submenu.add(new ActionMenu(TopMenu.ActionMenuKind.ACTIVE_USERS_COUNT, messageProvider, new ActiveUsersCountAction(viewContext)));

openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/administration/PropertyTypesMenu.java

@@ -17,7 +17,6 @@
 package ch.systemsx.cisd.openbis.generic.client.web.client.application.menu.administration;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.Dict;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.framework.ComponentProvider;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.menu.ActionMenu;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.menu.TopMenu;
@@ -34,30 +33,25 @@ import com.extjs.gxt.ui.client.widget.menu.MenuItem;
 public class PropertyTypesMenu extends MenuItem
 {
 
-    public PropertyTypesMenu(final IViewContext<?> viewContext, IMessageProvider messageProvider, ComponentProvider componentProvider)
+    public PropertyTypesMenu(IMessageProvider messageProvider, ComponentProvider componentProvider)
     {
         super(messageProvider.getMessage(Dict.MENU_PROPERTY_TYPES));
         setId(TopMenu.ActionMenuKind.ADMINISTRATION_MENU_MANAGE_PROPERTY_TYPES.toString());
-
         Menu menu = new Menu();
         menu.add(new ActionMenu(TopMenu.ActionMenuKind.PROPERTY_TYPES_MENU_NEW_PROPERTY_TYPES, messageProvider, componentProvider
                 .getPropertyTypeRegistration()));
         menu.add(new ActionMenu(TopMenu.ActionMenuKind.PROPERTY_TYPES_MENU_BROWSE_PROPERTY_TYPES, messageProvider, componentProvider
                 .getPropertyTypeBrowser()));
-        if (viewContext.getDisplaySettingsManager().isLegacyMedadataUIEnabled())
-        {
-            menu.add(new ActionMenu(TopMenu.ActionMenuKind.PROPERTY_TYPES_MENU_BROWSE_ASSIGNMENTS, messageProvider, componentProvider
-                    .getPropertyTypeAssignmentBrowser(null)));
-
-            menu.add(new ActionMenu(TopMenu.ActionMenuKind.PROPERTY_TYPES_MENU_ASSIGN_TO_DATA_SET_TYPE, messageProvider, componentProvider
-                    .getPropertyTypeDataSetTypeAssignmentForm()));
-            menu.add(new ActionMenu(TopMenu.ActionMenuKind.PROPERTY_TYPES_MENU_ASSIGN_TO_SAMPLE_TYPE, messageProvider, componentProvider
-                    .getPropertyTypeSampleTypeAssignmentForm()));
-            menu.add(new ActionMenu(TopMenu.ActionMenuKind.PROPERTY_TYPES_MENU_ASSIGN_TO_EXPERIMENT_TYPE, messageProvider, componentProvider
-                    .getPropertyTypeExperimentTypeAssignmentForm()));
-            menu.add(new ActionMenu(TopMenu.ActionMenuKind.PROPERTY_TYPES_MENU_ASSIGN_TO_MATERIAL_TYPE, messageProvider, componentProvider
-                    .getPropertyTypeMaterialTypeAssignmentForm()));
-        }
+        menu.add(new ActionMenu(TopMenu.ActionMenuKind.PROPERTY_TYPES_MENU_BROWSE_ASSIGNMENTS, messageProvider, componentProvider
+                .getPropertyTypeAssignmentBrowser(null)));
+        menu.add(new ActionMenu(TopMenu.ActionMenuKind.PROPERTY_TYPES_MENU_ASSIGN_TO_DATA_SET_TYPE, messageProvider, componentProvider
+                .getPropertyTypeDataSetTypeAssignmentForm()));
+        menu.add(new ActionMenu(TopMenu.ActionMenuKind.PROPERTY_TYPES_MENU_ASSIGN_TO_SAMPLE_TYPE, messageProvider, componentProvider
+                .getPropertyTypeSampleTypeAssignmentForm()));
+        menu.add(new ActionMenu(TopMenu.ActionMenuKind.PROPERTY_TYPES_MENU_ASSIGN_TO_EXPERIMENT_TYPE, messageProvider, componentProvider
+                .getPropertyTypeExperimentTypeAssignmentForm()));
+        menu.add(new ActionMenu(TopMenu.ActionMenuKind.PROPERTY_TYPES_MENU_ASSIGN_TO_MATERIAL_TYPE, messageProvider, componentProvider
+                .getPropertyTypeMaterialTypeAssignmentForm()));
         setSubMenu(menu);
     }
 }

openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/administration/TypesMenu.java

@@ -16,15 +16,16 @@
 
 package ch.systemsx.cisd.openbis.generic.client.web.client.application.menu.administration;
 
-import com.extjs.gxt.ui.client.widget.menu.Menu;
-import com.extjs.gxt.ui.client.widget.menu.MenuItem;
-
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.Dict;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.framework.ComponentProvider;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.menu.ActionMenu;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.menu.TopMenu;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.IMessageProvider;
 
+import com.extjs.gxt.ui.client.widget.menu.Menu;
+import com.extjs.gxt.ui.client.widget.menu.MenuItem;
+
 /**
  * Types menu for managing entity types.
  * 
@@ -33,7 +34,7 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.IMess
 public class TypesMenu extends MenuItem
 {
 
-    public TypesMenu(IMessageProvider messageProvider, ComponentProvider componentProvider)
+    public TypesMenu(final IViewContext<?> viewContext, IMessageProvider messageProvider, ComponentProvider componentProvider)
     {
         super(messageProvider.getMessage(Dict.MENU_TYPES));
         setId(TopMenu.ActionMenuKind.ADMINISTRATION_MENU_MANAGE_TYPES.toString());
@@ -50,6 +51,12 @@ public class TypesMenu extends MenuItem
         submenu.add(new ActionMenu(TopMenu.ActionMenuKind.DATA_SET_MENU_FILE_FORMATS,
                 messageProvider, componentProvider.getFileFormatTypeBrowser()));
 
+        if (false == viewContext.getDisplaySettingsManager().isLegacyMedadataUIEnabled())
+        {
+            submenu.add(new ActionMenu(TopMenu.ActionMenuKind.PROPERTY_TYPES_MENU_BROWSE_PROPERTY_TYPES, messageProvider, componentProvider
+                    .getPropertyTypeBrowser()));
+        }
+
         setSubMenu(submenu);
     }
 }